|
|
8e1e491fca
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 16:45:12 +08:00 |
|
|
|
d600df6381
|
新实训数据结构修改中
|
2022-08-12 16:45:02 +08:00 |
|
|
|
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 |
|
weizhihong
|
bc5f414193
|
【文字输入会话枚举类型BUG】
|
2022-08-12 15:28:15 +08:00 |
|
tiger_zhou
|
c4c803428c
|
进路延期取消的时候，不能手动取消进路
|
2022-08-12 14:24:20 +08:00 |
|
weizhihong
|
9cbfb97d98
|
【会话文件上传后增加返回结果】
|
2022-08-12 13:53:33 +08:00 |
|
tiger_zhou
|
ad180a4355
|
列车进路延时解锁时间180S,调车进路延时解锁为30S
|
2022-08-12 13:46:02 +08:00 |
|
weizhihong
|
2ba34056dc
|
【删除多余代码】
|
2022-08-12 13:33:27 +08:00 |
|
weizhihong
|
e865770a4b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-12 13:27:22 +08:00 |
|
weizhihong
|
3dcc6b5a66
|
【语音操作改为Base64上传】
|
2022-08-12 13:27:17 +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 |
|
|
|
e3fc0efeaf
|
新实训数据结构修改中
|
2022-08-12 11:04:00 +08:00 |
|
|
|
cc2c667e40
|
修改大铁通过进路生成的信号显示
|
2022-08-12 11:00:37 +08:00 |
|
|
|
782788e0e9
|
修改大铁通过进路生成的信号显示
|
2022-08-12 10:58:35 +08:00 |
|
|
|
0580471208
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 10:40:59 +08:00 |
|
|
|
7dad6b1419
|
部分地图数据删除showConditions字段
|
2022-08-12 10:40:42 +08:00 |
|
weizhihong
|
4f9a12e7a7
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-12 10:20:23 +08:00 |
|
weizhihong
|
dc0982bc97
|
【电话操作】
|
2022-08-12 10:20:18 +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 |
|
|
|
7b9fba8412
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 09:50:28 +08:00 |
|
|
|
9c1e2cfc9d
|
增加<故障通知>信号按钮类型
|
2022-08-12 09:50:17 +08:00 |
|
weizhihong
|
5fd42ccf40
|
【电话会话操作、聊天会话操作】
|
2022-08-12 09:45:02 +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
|
9a9171766b
|
【会话语音输入、文字输入操作】
|
2022-08-11 14:11:25 +08:00 |
|
weizhihong
|
efcdeaf26d
|
Merge remote-tracking branch 'remotes/origin/test' into test-training2
|
2022-08-11 13:50:31 +08:00 |
|
weizhihong
|
a95076aac1
|
【分路不良状态问题】
|
2022-08-11 13:05:15 +08:00 |
|
|
|
6a194ce09c
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-11 11:27:38 +08:00 |
|
|
|
d6b327f8cc
|
新实训增加<表达式>数据结构、实训数据增加运行图id、评分规则增加仿真成员信息
|
2022-08-11 11:27:24 +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
|
a809059e4a
|
Merge remote-tracking branch 'remotes/origin/test' into test-training2
|
2022-08-11 08:50:59 +08:00 |
|
weizhihong
|
b25d0ab80d
|
【会话操作枚举】
|
2022-08-11 08:50:27 +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 |
|
|
|
0c824032c4
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 15:21:36 +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 |
|
|
|
fb68e92e4d
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 10:03:44 +08:00 |
|
|
|
f42923f100
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:52:50 +08:00 |
|
|
|
1f3b7c65d2
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:20:51 +08:00 |
|
