Commit Graph

800 Commits

Author SHA1 Message Date
9ebd817e64 Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-16 18:28:40 +08:00
c521b9dcd6 Merge remote-tracking branch 'origin/test' into test 2021-03-16 13:30:44 +08:00
413a9c1c37 修改ATS进路触发接近区段检查逻辑问题,改为使用列车所在物理区段检查 2021-03-16 13:30:25 +08:00
397d6d9c3b 白名单修改 2021-03-15 20:42:44 +08:00
9dbdbc0a95 项目域名sql 2021-03-15 18:18:50 +08:00
DU
6cdc61151e 转换轨相邻车站交路生成修改 2021-03-15 17:03:40 +08:00
e7ab43038a 项目域名接口开发 2021-03-15 16:53:39 +08:00
5782b50944 Merge remote-tracking branch 'origin/test' into test 2021-03-15 16:24:56 +08:00
DU
d3f45b1b5e 生成时发车问题修改 2021-03-15 14:06:49 +08:00
DU
94b679893f 运行图问题修改 2021-03-15 13:07:32 +08:00
DU
a2a8f1f296 运行图问题修改 2021-03-15 13:05:04 +08:00
DU
5a8c4950c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-15 11:04:06 +08:00
DU
c8f52f5141 运行图交路相关修改 2021-03-15 11:03:57 +08:00
b3c5c4c4f8 白名单修改 2021-03-15 10:39:10 +08:00
1f94e0ff6d Merge remote-tracking branch 'origin/test' into test 2021-03-12 18:54:30 +08:00
7c72507527 新仿真逻辑——计算机联锁模块开发
仿真发布消息逻辑调整
2021-03-12 18:54:14 +08:00
a09f3312ed Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-12 18:46:02 +08:00
228ae47d1c Merge remote-tracking branch 'origin/test' into test 2021-03-12 18:45:14 +08:00
b6113a2fe9 Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-12 18:24:57 +08:00
30a1685935 南铁院岔心设置计轴故障/预复位 2021-03-12 17:44:50 +08:00
DU
4a7817cccb 修改 2021-03-12 16:55:03 +08:00
DU
16509551ee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-12 16:50:19 +08:00
DU
4c27f18a69 交路名称修改 2021-03-12 16:49:58 +08:00
f9f7564a0f Merge remote-tracking branch 'origin/test' into test 2021-03-12 16:43:43 +08:00
DU
c6b8227823 运行图编制交路设置修改 2021-03-12 15:07:50 +08:00
DU
6505702a13 运行图编制修改 2021-03-12 11:38:03 +08:00
0b2dce823e cgy添加使用记录 2021-03-12 11:03:10 +08:00
DU
5a6f87f401 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-12 09:10:39 +08:00
DU
775437150b 恢复交路自动生成默认交路,运行图编制可使用生成的交路。 2021-03-12 09:10:33 +08:00
8da937e941 新仿真逻辑——虚拟真实设备逻辑开发 2021-03-11 13:26:48 +08:00
7e96b047c2 ISCS查询接口添加校验 2021-03-11 10:44:46 +08:00
dd8cffe4a7 Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-11 10:33:02 +08:00
9681255916 将进路路径构建时的迭代次数改为由调用者传入 2021-03-11 10:26:55 +08:00
e7b35d89d2 Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-10 19:59:08 +08:00
37c306ac27 Merge remote-tracking branch 'origin/test' into test 2021-03-10 19:58:29 +08:00
a415ee4ad3 运行线添加筛选进路列表逻辑 2021-03-10 19:45:09 +08:00
d96b32d88a 泰雷兹排列进路到操作修改 2021-03-10 19:44:15 +08:00
b4d9b340d8 Merge remote-tracking branch 'origin/test' into master-huawei 2021-03-10 19:43:32 +08:00
a5cbd9b07c 运行线添加筛选进路列表逻辑 2021-03-10 19:42:20 +08:00
2faf256501 泰雷兹排列进路到操作修改 2021-03-10 19:40:35 +08:00
DU
0a126f41a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-10 17:58:39 +08:00
DU
1434f23db7 生成运行图问题修改 2021-03-10 17:58:30 +08:00
c0f1035f0e Merge remote-tracking branch 'origin/test' into test 2021-03-10 16:58:49 +08:00
7fdb0dd16b 按计划行车,转换轨列车加载问题修改 2021-03-10 16:58:27 +08:00
8ef6553a20 Merge remote-tracking branch 'origin/test' into test 2021-03-09 18:05:58 +08:00
34c1b72d2e 道岔转动恢复失表故障的概率改为1/3 2021-03-09 18:05:39 +08:00
DU
f2baa1b51f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-09 17:58:07 +08:00
DU
39441c9a37 折返时间根据交路加默认值 2021-03-09 17:57:56 +08:00
cf6cc759e9 Merge remote-tracking branch 'origin/test' into test 2021-03-09 17:25:16 +08:00
104f50793d 南铁院问题修改 2021-03-09 17:24:49 +08:00