Commit Graph

11366 Commits

Author SHA1 Message Date
fan
f3a1e22e65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 11:22:04 +08:00
fan
024f1c8963 接受会话后同账户清除响铃 2022-08-03 11:21:52 +08:00
joylink_cuiweidong
01b44ccccf 代码调整 2022-08-03 11:02:35 +08:00
joylink_cuiweidong
ecb9287adf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-03 11:00:48 +08:00
joylink_cuiweidong
f1dc88be33 场景编辑代码调整 2022-08-03 11:00:31 +08:00
fan
f07596a30d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 10:04:44 +08:00
fan
6360e26c89 簿册车站传递调整 2022-08-03 10:04:31 +08:00
Yuan
9530acaa44 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-08-03 10:01:23 +08:00
Yuan
75025ed307 bugfix 2022-08-03 10:00:49 +08:00
fan
c5d11595cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 09:23:58 +08:00
Yuan
d1680c32e5 Merge branch 'yly' into test 2022-08-02 18:12:34 +08:00
Yuan
df174615ba jd1A调整,信号按钮调整 2022-08-02 18:12:03 +08:00
fan
3e105c3f8b 代码调整 2022-08-02 18:01:42 +08:00
dong
f81e76fa20 代码调整 2022-08-02 16:36:20 +08:00
dong
a65afc6cab 代码调整 2022-08-02 16:15:47 +08:00
dong
de71dc5c91 代码调整 2022-08-02 15:06:50 +08:00
dong
9d68eac471 进路修改 2022-08-02 14:38:39 +08:00
dong
0998fdffbe 进路修改 2022-08-02 14:10:18 +08:00
joylink_cuiweidong
7c0d160c68 大铁线路 剧本编制 添加 修改系统时间 2022-08-02 11:28:20 +08:00
joylink_cuiweidong
ba4f2efc6b 去除断点 2022-08-02 11:01:57 +08:00
joylink_cuiweidong
91e572ca1e 代码调整 2022-08-02 11:00:18 +08:00
joylink_cuiweidong
3131edd93b 代码调整 2022-08-02 10:33:35 +08:00
joylink_cuiweidong
9067b54e97 代码调整 2022-08-02 09:57:11 +08:00
joylink_cuiweidong
f7dbb557c7 代码调整 2022-08-02 09:44:39 +08:00
joylink_cuiweidong
75f268cf21 添加 车务段段长 仿真角色 2022-08-01 17:48:03 +08:00
joylink_cuiweidong
553aa18f3d 代码调整 2022-08-01 17:26:16 +08:00
joylink_cuiweidong
b404adfbed 代码调整 2022-08-01 16:54:33 +08:00
joylink_cuiweidong
ec72904bef 剧本预览提示代码调整 2022-08-01 16:37:04 +08:00
fan
b9cd660a7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-01 15:39:39 +08:00
fan
1bc2342172 哈尔滨盈达科技大铁项目 2022-08-01 15:39:12 +08:00
joylink_cuiweidong
67bedb3245 剧本预览添加 倍速功能 2022-08-01 15:27:51 +08:00
joylink_cuiweidong
5b75682471 大铁线路 联锁 菜单颜色 显示 调整 2022-08-01 13:50:04 +08:00
joylink_cuiweidong
a33556ce64 代码调整 2022-07-29 18:04:28 +08:00
joylink_cuiweidong
80ef093b10 代码调整 2022-07-29 17:57:08 +08:00
joylink_cuiweidong
d802a397ba 大铁线路 列车 添加 列车脱线故障 2022-07-29 17:28:54 +08:00
joylink_cuiweidong
028ded01e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-29 17:10:43 +08:00
joylink_cuiweidong
5132d43595 大铁线路 剧本 道岔钩锁和换端指令添加 2022-07-29 17:09:15 +08:00
dong
d835c074dd 代码调整 2022-07-29 15:15:14 +08:00
dong
24561974d6 代码调整 2022-07-29 14:54:58 +08:00
dong
2bc1ae8cf3 代码调整 2022-07-29 14:41:36 +08:00
Yuan
2e79ca8d27 Merge branch 'yly' into test 2022-07-29 13:56:29 +08:00
Yuan
838559280d merge 2022-07-29 13:56:02 +08:00
dong
aa344631ff 代码调整 2022-07-29 13:37:09 +08:00
Yuan
10eba07da8 JD1A风格改造 2022-07-29 13:33:44 +08:00
joylink_cuiweidong
c8d4901149 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-29 11:00:51 +08:00
joylink_cuiweidong
70ec386b9d 大铁线路 剧本编制 车站扳道员 添加 道岔钩锁 2022-07-29 11:00:28 +08:00
dong
7c7099120c 代码调整 2022-07-29 10:16:46 +08:00
joylink_cuiweidong
129b1be713 代码调整 2022-07-28 13:37:00 +08:00
joylink_cuiweidong
d0dd19927b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-28 10:17:24 +08:00
joylink_cuiweidong
9a8d442d7f 大铁线路 剧本编制 司机 展示 对应指令 2022-07-28 10:17:08 +08:00
dong
d099b7f577 修改剧本调度命令提示 2022-07-28 09:53:17 +08:00
joylink_cuiweidong
55bb88cb19 代码调整 2022-07-27 18:28:17 +08:00
joylink_cuiweidong
8295b811d4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-27 18:21:57 +08:00
joylink_cuiweidong
ccf640c492 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
2022-07-27 18:21:37 +08:00
dong
592a40c7cd 查询调度命令参数修改 2022-07-27 18:19:09 +08:00
joylink_cuiweidong
6588b454a0 代码调整 2022-07-27 18:14:38 +08:00
dong
a7163cb437 剧本调度命令指令参数提示 2022-07-27 18:14:22 +08:00
joylink_cuiweidong
b40038910e 代码调整 2022-07-27 16:23:01 +08:00
joylink_cuiweidong
110d17436e 大铁线路 对信号机封锁操作,不影响信号显示 2022-07-27 14:12:34 +08:00
joylink_cuiweidong
523d0a111e 代码调整 2022-07-27 13:43:13 +08:00
joylink_cuiweidong
6fa3e9dec6 地图线路公共配置项 添加 对信号机封锁操作,是否影响信号显示 2022-07-27 13:14:46 +08:00
joylink_cuiweidong
d28803292e 添加 修改系统时间接口
剧本编制 添加角色 代码调整
2022-07-27 11:28:18 +08:00
dong
f8b83fc4e6 剧本行调命令指令 2022-07-26 18:10:14 +08:00
fan
93a4010ea8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-07-26 18:05:20 +08:00
fan
84c78ef8e4 列车 故障操作停车调整 2022-07-26 18:05:11 +08:00
joylink_cuiweidong
36f6b85e57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 17:43:43 +08:00
joylink_cuiweidong
2548337fc7 车务终端 订阅ctc 代码调整 2022-07-26 17:43:10 +08:00
fan
d23037f4f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-07-26 16:46:22 +08:00
fan
67071c8830 大铁02 列车故障操作驾驶调整 2022-07-26 16:46:10 +08:00
joylink_cuiweidong
246f204eb7 代码调整 2022-07-26 16:30:48 +08:00
joylink_cuiweidong
d79e95425b 代码调整 2022-07-26 16:11:31 +08:00
joylink_cuiweidong
c26c57930b 代码调整 2022-07-26 15:53:19 +08:00
joylink_cuiweidong
faea986734 大铁线路 添加 封锁/解封 指令 2022-07-26 15:51:12 +08:00
joylink_cuiweidong
c92d77fb69 给 信号员 添加 现地权限 2022-07-26 13:55:26 +08:00
joylink_cuiweidong
50bf7d7a63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 13:30:59 +08:00
joylink_cuiweidong
2e48ac5cc6 代码调整 2022-07-26 13:30:27 +08:00
fan
0fde576279 大铁02 点灯灭灯注释 2022-07-26 13:21:37 +08:00
fan
8d69e59d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 13:03:36 +08:00
fan
7998e3de92 大铁02 放开驾驶 线路配置 增加 区故解只能应用于故障锁闭区段 2022-07-26 13:03:20 +08:00
joylink_cuiweidong
82f44d3499 剧本编制 放开会话和指令的删除
修改剧本 角色的名称
2022-07-26 11:21:58 +08:00
joylink_cuiweidong
2614802a12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 10:41:25 +08:00
joylink_cuiweidong
7cd2ecc2dc 代码调整 2022-07-26 10:41:08 +08:00
fan
5e9964f705 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 10:38:57 +08:00
fan
12b3f904dc 大铁02 放开故障挤岔 2022-07-26 10:38:32 +08:00
joylink_cuiweidong
07d515e9ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 10:15:03 +08:00
joylink_cuiweidong
922d4641b7 剧本 添加设备管理员 2022-07-26 10:14:45 +08:00
weizhihong
cf76d48025 【增加设备管理员】 2022-07-26 09:34:50 +08:00
weizhihong
b4b61aa0cf 【大铁角色中文配置】 2022-07-26 08:45:58 +08:00
joylink_cuiweidong
636819e9a5 代码调整 2022-07-25 18:06:04 +08:00
joylink_cuiweidong
5f77691e8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 17:50:04 +08:00
joylink_cuiweidong
5067f0132f 添加 剧本角色 站长、助理、信号员、客运员、扳道员 、引导员、工务工 2022-07-25 17:49:38 +08:00
fan
474bcacb8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 16:47:30 +08:00
fan
472985e919 大铁02 放开限速指令 2022-07-25 16:47:13 +08:00
joylink_cuiweidong
3787289c32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 16:33:17 +08:00
joylink_cuiweidong
856a5b676a 剧本切换角色 ctc 对应车站未更改bug 调整 2022-07-25 16:33:04 +08:00
fan
70ec2a6c79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 16:15:26 +08:00
fan
45f1af2602 故障锁闭 2022-07-25 16:13:09 +08:00
dong
a97a2a7753 调度命令发送指令 2022-07-25 14:10:59 +08:00
joylink_cuiweidong
37b527d7cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 13:57:45 +08:00
joylink_cuiweidong
2ff39c6c89 代码调整 2022-07-25 13:57:33 +08:00