Commit Graph

11088 Commits

Author SHA1 Message Date
fan
37aa25a453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-14 09:18:18 +08:00
fan
e620df092c 南京二号线行调问题调整 2021-10-14 09:18:06 +08:00
yuan
f5f4db14c5 大屏登录后跳转url增加prdType字段用于车辆段显隐处理 2021-10-13 17:16:13 +08:00
yuan
58a2ca0192 综合演练屏蔽掉车辆段显示 2021-10-13 16:31:46 +08:00
fan
b3b5780a27 南京二号线行调调整 2021-10-12 15:50:02 +08:00
fan
720a638720 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-12 14:31:58 +08:00
fan
5768b8d263 南京二号线车站调整 2021-10-12 14:31:49 +08:00
yuan
36bd886cb2 设备管理增加派班工作站,修改车辆段和派班工作站的路径 2021-10-12 11:02:36 +08:00
fan
4acb11fa2d 区段信号机道岔添加字段srCode 沙盘设备编号 2021-10-12 10:52:37 +08:00
fan
414e7f16a4 大屏配置回显 2021-10-12 10:36:25 +08:00
fan
e4d8d5650e 大屏显示调整 (调用行调配置处理设备) 2021-10-12 09:36:52 +08:00
fan
d9c040dbe9 ISCS 订阅调整 2021-10-11 17:45:15 +08:00
fan
48efa2cfb8 车辆段显示位置初始化调整 2021-10-11 16:41:56 +08:00
fan
edc9fee0a7 南京二号线计算行车间隔指令参数调整 2021-10-11 14:24:31 +08:00
fan
2454ed857f Merge remote-tracking branch 'origin/test' 2021-10-09 15:45:42 +08:00
fan
6e5ceeeb66 关闭南京二号线行调显示界面 2021-10-09 15:44:00 +08:00
fan
ee7d8e9300 南京二号线调整行车间隔 2021-10-08 09:53:49 +08:00
fan
4c5bc63030 南京二行调增加日记界面和命令界面 2021-09-30 09:43:10 +08:00
fan
34b156df80 侧防列表显示调整 2021-09-29 17:02:37 +08:00
fan
72bcc0596b 福州一 车联段停车场信号机操作 增加限制条件 2021-09-29 16:22:03 +08:00
fan
fd6e7c9f09 南京二号线 atr 列车信息 2021-09-29 15:35:26 +08:00
fan
869840f0e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-29 13:19:49 +08:00
fan
1e12edd90e 综合演练停车场显示调整 2021-09-29 13:19:29 +08:00
sunzhenyu
d23143a1cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-29 13:18:31 +08:00
sunzhenyu
36fee6efda 其他三维相关内容分拆 2021-09-29 13:18:24 +08:00
fan
969a35eec1 列车初始化时 重新解析数据 以清除残留状态 2021-09-29 10:12:49 +08:00
fan
01732b6b9a 修正: 现地显示配置生成权限的时候未生成车站数据 2021-09-29 09:46:25 +08:00
fan
f1b3b9ab8f Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/scripts/ProjectConfig.js
2021-09-28 18:41:07 +08:00
fan
096e87803d 综合演练列车显示bug调整 2021-09-28 18:16:05 +08:00
fan
8aa97948b6 车辆段联锁工作站 增加初始化 2021-09-28 17:44:25 +08:00
fan
dc2ca8df5a BUG:初始化后切换角色导致列车显示 2021-09-28 15:12:54 +08:00
fan
86be83d612 综合演练车辆段切行调现地显示调整 2021-09-28 13:10:12 +08:00
fan
6786dd92f4 进路预览进路编辑增加 endButtonSignalCode 2021-09-28 11:26:30 +08:00
fan
aedf08b85f 排列进路问题调整 2021-09-28 10:01:48 +08:00
fan
15f5fdf664 综合演练切换车联段停车场后显示调整 2021-09-28 09:42:00 +08:00
fan
673d2e474c 添加信号机类型出段信号机 进段信号机 2021-09-27 16:43:57 +08:00
fan
4225f58d50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-27 14:38:26 +08:00
fan
d34be1ce8b 修改预选模式 2021-09-27 14:38:11 +08:00
fan
6df79d9ca9 aspect W&B处理 2021-09-27 10:45:08 +08:00
sunzhenyu
64cbe4c857 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-27 10:24:24 +08:00
sunzhenyu
47ec0a8b7d 修改三维驾驶atp按钮,修改屏蔽门不开bug 2021-09-27 10:24:15 +08:00
fan
306bdb7cba 仿真结束清除SimulationUserList 2021-09-26 18:11:13 +08:00
fan
48ea31da91 导出地图取消必选和默认选中&删除调试日志 2021-09-26 17:55:08 +08:00
fan
0928d8cfa9 显示配置中添加信号机位置修正 2021-09-26 17:37:57 +08:00
fan
48d4a7129f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 16:02:20 +08:00
fan
c79329cee7 显示配置 select label 调整 2021-09-26 16:02:03 +08:00
sunzhenyu
d07a4029f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 15:01:12 +08:00
sunzhenyu
db908d63a1 修改三維駕駛psl 2021-09-26 15:01:07 +08:00
fan
6ab1c03a24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-26 14:37:20 +08:00
fan
461a9a9343 取消灯丝故障显示 2021-09-26 14:37:08 +08:00