|
|
aacca91bb8
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-10-26 18:46:42 +08:00 |
|
|
|
871287eb1c
|
ibp盘关闭锁紧信号bug修改
|
2021-10-26 18:36:01 +08:00 |
|
|
|
89c23e50e3
|
修改道岔转动及控制权交出、接收bug
|
2021-10-25 16:05:35 +08:00 |
|
|
|
13506c2faa
|
修改，按计划行车时，列车前方进路中道岔不进路锁闭bug
|
2021-10-25 14:52:35 +08:00 |
|
|
|
b445b59290
|
上饶沙盘(除列车)
|
2021-10-22 18:06:02 +08:00 |
|
|
|
fd9a54f816
|
修改区段占用状态更新逻辑
|
2021-10-20 13:59:24 +08:00 |
|
|
|
e4891a7b8f
|
上饶沙盘（未完）
|
2021-10-15 18:18:35 +08:00 |
|
|
|
554246fa7d
|
修改地图数据校验
|
2021-10-15 18:17:55 +08:00 |
|
|
|
c319250093
|
修改福州实训问题
|
2021-10-14 14:30:12 +08:00 |
|
|
|
38848dbd14
|
修改义乌配置
|
2021-10-13 18:02:17 +08:00 |
|
|
|
cc822474f7
|
修改隔离模式默认状态
|
2021-10-13 14:49:09 +08:00 |
|
|
|
a828a2a03e
|
义乌iscs调整
|
2021-10-12 14:56:21 +08:00 |
|
|
|
7511b23764
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-10-12 10:42:27 +08:00 |
|
|
|
e1b6675967
|
增加上饶沙盘项目、地图数据增加上饶沙盘设备编号
|
2021-10-12 10:42:03 +08:00 |
|
|
|
4016623302
|
进路道岔解锁bug修改（A进路道岔解锁导致已经办理的B进路道岔被解锁）
|
2021-10-12 09:57:42 +08:00 |
|
|
|
7e656054f3
|
按计划行车进路解锁逻辑bug修改
|
2021-10-11 18:25:56 +08:00 |
|
|
|
b13944eeea
|
进路路径筛选进路逻辑调整
|
2021-10-11 17:01:01 +08:00 |
|
|
|
dc80448b59
|
Merge remote-tracking branch 'origin/test' into test
|
2021-10-11 16:59:51 +08:00 |
|
|
|
fc8f17cdb4
|
按计划行车办理进路、解锁进路逻辑调整
进路路径筛选进路逻辑调整
直接办理进路道岔转动bug修改
|
2021-10-11 16:59:33 +08:00 |
|
|
|
1d9ad4eeb8
|
地图显示配置增加参数
|
2021-10-11 15:22:11 +08:00 |
|
|
|
b9774a08fc
|
取消行车间隔调度生效逻辑
|
2021-10-11 15:16:30 +08:00 |
|
|
|
8553584150
|
南京列车调度-行车间隔调度
|
2021-10-11 14:43:57 +08:00 |
|
|
|
55769ee2dc
|
删除无用代码和注解
|
2021-10-09 11:14:02 +08:00 |
|
|
|
765eae6f61
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-10-08 15:53:35 +08:00 |
|
|
|
3364b096f5
|
修改按计划行车的进路办理、解锁逻辑
|
2021-10-08 15:53:18 +08:00 |
|
Jade
|
5cb7d7bac7
|
车辆段联锁生成调整
|
2021-09-29 17:36:42 +08:00 |
|
Jade
|
32b2bb7516
|
侧防code查询
|
2021-09-29 17:06:11 +08:00 |
|
|
|
ba091b3edf
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-09-28 18:32:11 +08:00 |
|
|
|
3a52cbc4e4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-28 18:14:40 +08:00 |
|
|
|
8f43e51dba
|
列车运行级别升级需ma的atp防护速度为正；计轴故障区段不会再显示通信车占用
|
2021-09-28 18:14:28 +08:00 |
|
Jade
|
d48547959f
|
车辆段联锁生成-终端按钮
|
2021-09-28 17:23:46 +08:00 |
|
|
|
a345f73528
|
设备指令完成后将指令置为null（设置、取消屏蔽门无法关闭故障后，屏蔽门还是无法关闭）
|
2021-09-28 17:22:42 +08:00 |
|
|
|
ea64d61fa5
|
列车车头/车尾在计轴故障区段时无法升级至CBTC
|
2021-09-28 16:23:59 +08:00 |
|
|
|
1b6ffa0b8c
|
扣车状态不再影响更新列车target；ato开启条件减少
|
2021-09-28 16:14:46 +08:00 |
|
|
|
7ba23fb272
|
按计划行车时，<办理ats选择的进路>逻辑迁移
|
2021-09-28 15:26:10 +08:00 |
|
|
|
ec640aafc4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-28 15:17:19 +08:00 |
|
|
|
7e0bafc6db
|
按计划行车时，在构建列车监控处添加<通过ats为列车选择进路，并直接办理>逻辑
|
2021-09-28 15:17:10 +08:00 |
|
Jade
|
548564d146
|
车辆段联锁生成-终端按钮
|
2021-09-28 14:53:51 +08:00 |
|
Jade
|
7f6d9c863d
|
车辆段联锁生成-出段/进段信号机
|
2021-09-27 17:40:30 +08:00 |
|
|
|
6872f9b7bf
|
指令适配新的列车操作方式
|
2021-09-27 17:18:31 +08:00 |
|
|
|
f240238e56
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-27 14:45:18 +08:00 |
|
|
|
2c5b139ff8
|
添加切换预选模式指令、移除切换驾驶模式指令
|
2021-09-27 14:45:10 +08:00 |
|
|
|
d7b5df2b3b
|
修改自动/联动开关门判定并添加机器人开关门逻辑
|
2021-09-27 14:43:23 +08:00 |
|
|
|
d350d4fd6b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-27 10:41:56 +08:00 |
|
|
|
28997a2b52
|
仿真数据构建添加信号机类型和型号校验
联锁生成信号机型号不正确时抛出异常
|
2021-09-27 10:41:43 +08:00 |
|
|
|
3ebfe664d5
|
列车预选模式降RM依然粉光带bug修改
|
2021-09-27 10:02:35 +08:00 |
|
|
|
316e43d697
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-26 18:09:08 +08:00 |
|
|
|
a50ab163eb
|
发布地图导入导出修改
|
2021-09-26 18:08:59 +08:00 |
|
|
|
e94772cff0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-26 17:39:22 +08:00 |
|
|
|
bc0a6c5757
|
显示数据添加修订设备位置相关属性
|
2021-09-26 17:39:09 +08:00 |
|
