weizhihong
|
f4457f737b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/controller/training2/TrainingV2Controller.java
# src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
|
2022-08-16 16:10:18 +08:00 |
|
xiazengbin
|
54868de8c2
|
创建实训草稿
|
2022-08-16 16:07:18 +08:00 |
|
weizhihong
|
07454c3a0b
|
【实训步骤编辑、查询】
|
2022-08-16 15:52:31 +08:00 |
|
xiazengbin
|
8440643eab
|
training2
|
2022-08-16 15:42:49 +08:00 |
|
xiazengbin
|
3ba7fa5916
|
training2
|
2022-08-16 14:54:15 +08:00 |
|
xiazengbin
|
f4c7f29df1
|
training2 table
|
2022-08-16 14:32:37 +08:00 |
|
xiazengbin
|
459d2caf23
|
training2
|
2022-08-16 13:57:40 +08:00 |
|
xiazengbin
|
77c10de68d
|
draft training2 数据库定义相关
|
2022-08-16 13:55:18 +08:00 |
|
|
|
f9f9c998ec
|
修改注解
|
2022-08-16 13:25:30 +08:00 |
|
|
|
d98fdd15cb
|
删除实训数据中的operaJson；增加Valuable新实现
|
2022-08-16 13:20:10 +08:00 |
|
|
|
cee7197c70
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-16 11:10:06 +08:00 |
|
|
|
45e5ad302b
|
新实训数据结构修改中
|
2022-08-16 11:09:52 +08:00 |
|
weizhihong
|
b1606676e2
|
【新增消息类型语音、文字】
|
2022-08-16 10:43:20 +08:00 |
|
weizhihong
|
8bf5a4b807
|
Merge branch 'test' into test-training2
|
2022-08-16 10:28:46 +08:00 |
|
|
|
1e69db5a5e
|
新实训数据结构修改中
|
2022-08-15 17:47:02 +08:00 |
|
tiger_zhou
|
f3df206427
|
修改：添加车辆停靠车站时，车门关闭后向前行驶一点的问题，因为车头偏移小于目标偏移（设定）
|
2022-08-15 17:19:01 +08:00 |
|
weizhihong
|
33203131b2
|
【增加Train_Drive命令，后续切换完成后，将Train_Trust删除】
|
2022-08-15 15:05:20 +08:00 |
|
weizhihong
|
e5db5e02f4
|
【切换为RM模式后，再次切换AM死循环问题】
|
2022-08-15 14:04:05 +08:00 |
|
|
|
73a1ad2e3d
|
新实训数据结构修改中
|
2022-08-15 10:58:45 +08:00 |
|
weizhihong
|
35236a831a
|
【回库折返轨判断】
|
2022-08-15 10:33:46 +08:00 |
|
|
|
18d9d72347
|
新实训数据结构修改中
|
2022-08-15 09:33:34 +08:00 |
|
|
|
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 |
|
