|
|
ad6fd2ac37
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-12 15:48:07 +08:00 |
|
|
|
ebdcd4362c
|
信号按钮增加有无计数器字段
|
2022-08-12 15:47:43 +08:00 |
|
tiger_zhou
|
c4c803428c
|
进路延期取消的时候，不能手动取消进路
|
2022-08-12 14:24:20 +08:00 |
|
tiger_zhou
|
ad180a4355
|
列车进路延时解锁时间180S,调车进路延时解锁为30S
|
2022-08-12 13:46:02 +08:00 |
|
xiazengbin
|
8c1dee2202
|
组合进路-通过进路信号
|
2022-08-12 13:07:44 +08:00 |
|
xiazengbin
|
fbcf1e645e
|
merge
|
2022-08-12 11:31:35 +08:00 |
|
xiazengbin
|
4fe596c803
|
组合进路
|
2022-08-12 11:11:49 +08:00 |
|
|
|
cc2c667e40
|
修改大铁通过进路生成的信号显示
|
2022-08-12 11:00:37 +08:00 |
|
|
|
6170ebc3f5
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-12 09:52:23 +08:00 |
|
|
|
8dcfce7354
|
增加<故障通知>信号按钮类型
|
2022-08-12 09:52:08 +08:00 |
|
tiger_zhou
|
f08f1e37ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin
|
2022-08-12 09:38:23 +08:00 |
|
tiger_zhou
|
214a4ae7d0
|
列车进路延时解锁时间180S,调车进路延时解锁为30S
|
2022-08-12 09:37:56 +08:00 |
|
xiazengbin
|
112ab6cbab
|
每次开始触发办理进路时设置开放信号显示
|
2022-08-11 17:56:34 +08:00 |
|
weizhihong
|
a95076aac1
|
【分路不良状态问题】
|
2022-08-11 13:05:15 +08:00 |
|
xiazengbin
|
4073382b85
|
3.233
|
2022-08-11 11:20:13 +08:00 |
|
xiazengbin
|
f0fc1fed80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzbsignal
|
2022-08-11 11:09:35 +08:00 |
|
xiazengbin
|
5476db3db3
|
signal
|
2022-08-11 09:19:10 +08:00 |
|
weizhihong
|
c2394f3eb9
|
【重置时，分路不良状态改成false】
|
2022-08-11 09:12:51 +08:00 |
|
weizhihong
|
54d617f77b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-08-11 08:48:46 +08:00 |
|
weizhihong
|
f754e6d07f
|
【行驶至前方站、进路闭塞行驶，合并入驾驶操作中】
|
2022-08-11 08:48:40 +08:00 |
|
|
|
26c5be81b0
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-10 15:21:07 +08:00 |
|
|
|
5326a53baa
|
草稿进路更新功能增加<离去区段占用与信号对应关系>
|
2022-08-10 15:20:55 +08:00 |
|
weizhihong
|
1e4071d79c
|
【去除角色司机限制】
|
2022-08-10 13:37:47 +08:00 |
|
weizhihong
|
a5640fb52b
|
【删除越红灯行驶、越引导信号行驶、限速、驾驶至、大铁发车、停车操作】
|
2022-08-10 13:07:57 +08:00 |
|
|
|
f42923f100
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:52:50 +08:00 |
|
|
|
1f3b7c65d2
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:20:51 +08:00 |
|
|
|
a90973fa2c
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-09 17:28:02 +08:00 |
|
tiger_zhou
|
8131728783
|
修改操作类型的属性调整
|
2022-08-09 17:20:00 +08:00 |
|
|
|
f0ca9e9c77
|
Revert "Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据""
This reverts commit 4654dc4b71.
|
2022-08-09 17:10:00 +08:00 |
|
tiger_zhou
|
71dadb5468
|
修改操作类型的属性调整
|
2022-08-09 10:00:36 +08:00 |
|
tiger_zhou
|
c89a2ba5e4
|
修改操作类型的属性
|
2022-08-09 09:46:20 +08:00 |
|
weizhihong
|
b2d7404f96
|
【行驶至操作】
|
2022-08-05 17:21:17 +08:00 |
|
weizhihong
|
162eedbcfd
|
【指令修改为操作】
|
2022-08-05 16:56:13 +08:00 |
|
|
|
b892606e76
|
修改local数据库配置
|
2022-08-05 16:13:26 +08:00 |
|
weizhihong
|
26f96fed02
|
【剧本信息保存实体修改】
|
2022-08-04 16:49:51 +08:00 |
|
weizhihong
|
bf22dac447
|
【保存剧本时，保存进路序列、占线板、路票、红色通行证、绿色通行证】
【股道区段用sectionCode】
【剧本会话动作删除】
|
2022-08-04 11:28:20 +08:00 |
|
|
|
4654dc4b71
|
Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据"
This reverts commit d294dfafe8.
|
2022-08-04 10:11:48 +08:00 |
|
|
|
7d9d14086a
|
修改生成大铁通过进路的逻辑
|
2022-08-03 16:38:23 +08:00 |
|
|
|
d294dfafe8
|
增加大铁发车进路信号受离去区段占用影响逻辑与数据
|
2022-08-03 13:50:25 +08:00 |
|
|
|
1f3173f393
|
会话接通消息中增加会话创建人id
|
2022-08-03 11:10:02 +08:00 |
|
xiazengbin
|
adace3d7e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-02 14:44:24 +08:00 |
|
xiazengbin
|
03b6cc1b20
|
添加段长
|
2022-08-02 14:44:14 +08:00 |
|
|
|
b9701a13ce
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-02 13:05:26 +08:00 |
|
|
|
4dcf64d9ff
|
大铁引导总锁失表道岔，可办理引导进路
|
2022-08-02 13:05:16 +08:00 |
|
weizhihong
|
97a8e522e7
|
【修改系统时间BUG修改】
|
2022-08-02 10:34:09 +08:00 |
|
weizhihong
|
c0dd13e3dd
|
【修改进路信息时，保存进路类型】
|
2022-08-02 09:42:59 +08:00 |
|
weizhihong
|
25a4c8911f
|
【接发箭头占用逻辑注释】
|
2022-08-01 17:27:27 +08:00 |
|
weizhihong
|
b159fb3ce2
|
【联锁接发车灯状态逻辑】
|
2022-08-01 17:19:40 +08:00 |
|
xiazengbin
|
b471ba466b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-01 17:12:40 +08:00 |
|
xiazengbin
|
c22c5b2691
|
fault offline
|
2022-08-01 17:12:32 +08:00 |
|
