Commit Graph

995 Commits

Author SHA1 Message Date
ec71cf4c20 Merge remote-tracking branch 'origin/test' into test 2021-01-27 19:05:33 +08:00
467cae3d01 运行图发布后删除缓存 2021-01-27 19:05:20 +08:00
DU
62edf56871 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-27 18:17:43 +08:00
DU
e1ef8cf549 运行图编制修改,加载列车位置修改,ato bug修改 2021-01-27 18:17:34 +08:00
f6814f8e04 客流模拟仿真逻辑调整
修改停站时间策略逻辑bug
添加跳停策略和计算服务对象,未实现
2021-01-27 15:33:59 +08:00
2ddedd3134 Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:41:56 +08:00
bf326074ad 修改取消进路时延时解锁条件 2021-01-26 18:41:51 +08:00
927b5bb83c Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:39:22 +08:00
51285bf767 客流策略流程和停站时间策略逻辑开发 2021-01-26 18:39:05 +08:00
DU
bf3bf28fad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 16:21:45 +08:00
DU
44a7972427 实训生成修改 2021-01-26 16:21:32 +08:00
4322ed671e Merge remote-tracking branch 'origin/test' into test 2021-01-26 14:32:29 +08:00
e92867a2bc 添加项目枚举 2021-01-26 14:32:08 +08:00
b678d3e103 Merge remote-tracking branch 'origin/test' into test 2021-01-26 13:18:17 +08:00
17abe86959 列车初始化bug修改;取消进路延时解锁条件修改;设头码车时查询路径逻辑修改 2021-01-26 13:18:10 +08:00
DU
d491b56ef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 10:01:19 +08:00
DU
bd75dd9b3e 站间距计算修改 2021-01-26 10:01:08 +08:00
bb8a694132 Merge remote-tracking branch 'origin/test' into test 2021-01-26 09:12:20 +08:00
0aae6b66fc Merge remote-tracking branch 'origin/passenger' into test 2021-01-26 09:01:51 +08:00
8911cfa6b1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:44:37 +08:00
7d30ceb7de 列车添加倒车最大速度,列车运行逻辑对应修改 2021-01-25 19:44:32 +08:00
DU
d8897d80d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 19:26:42 +08:00
DU
8deceb2a2c 站间距根据精确到停车点;
折返按钮状态保存
2021-01-25 19:26:31 +08:00
c159f9a8c1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:13:35 +08:00
f4c16da685 碰撞检测bug修改 2021-01-25 19:13:23 +08:00
1f88489d3b Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:05:43 +08:00
1527a8ccf1 信号重复封锁逻辑修改 2021-01-25 19:05:30 +08:00
02d4d12933 Merge remote-tracking branch 'origin/test' into test 2021-01-25 18:45:46 +08:00
8459f38fc3 添加列车<倒车限速><碰撞检测逻辑> 2021-01-25 18:45:36 +08:00
5a53001eaf 信号重复封锁逻辑修改 2021-01-25 18:31:28 +08:00
DU
15462ece3a 站间距离修改 2021-01-25 17:48:06 +08:00
ebb8cfd55e Merge remote-tracking branch 'origin/test' into test 2021-01-25 17:45:46 +08:00
DU
c26fb273e8 折返站的设置折返实训 2021-01-25 17:16:01 +08:00
DU
96acf9671b 运行等级的站间距离根据地图重新更新 2021-01-25 17:11:02 +08:00
DU
f3eb9096c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 16:17:48 +08:00
4da39b13f2 Merge remote-tracking branch 'origin/test' into test 2021-01-25 16:14:23 +08:00
f05398e33c 信号重复封锁的检查区段改为第一个逻辑区段;<延续保护未锁闭>的移动授权改为<延续保护前100m|延续保护前一个区段距离更远的那个端点> 2021-01-25 16:13:57 +08:00
e5fe7c4dd3 联锁生成——延续保护和侧防生成道岔相关逻辑调整
仿真初始化进路状态添加侧防元素转换锁闭逻辑
进路服务修改侧防锁闭,道岔预先锁闭等逻辑
2021-01-25 16:13:21 +08:00
DU
e33afe5a10 更新站间运行等级也可修改距离 2021-01-25 15:44:10 +08:00
DU
a4e4dd92cf 西安二号线 车站设置折返线 实训 2021-01-25 15:19:54 +08:00
DU
36b509ff40 更新站间数据 2021-01-25 14:47:57 +08:00
5e2c83d565 信号重开逻辑修改 2021-01-25 14:47:46 +08:00
DU
04eb086254 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 14:12:00 +08:00
DU
3d99582eb1 组织用户关系更改 2021-01-25 14:11:45 +08:00
DU
7120e303be 成都三现地信号机自动控和人工控实训名字 2021-01-25 14:00:47 +08:00
4a4c5fa92f 修改车站字段类型 2021-01-25 13:29:32 +08:00
642fc17de5 列车移动授权计算对<屏蔽门开启>情况的处理逻辑修改;道岔、车站添加字段 2021-01-25 13:13:42 +08:00
2a8e87ce14 Merge remote-tracking branch 'origin/test' into test 2021-01-25 11:24:39 +08:00
68e57fa9b0 添加进路延续保护侧防锁闭和解锁逻辑 2021-01-25 11:24:20 +08:00
e351662dcc 添加挤岔恢复指令 2021-01-22 21:12:01 +08:00