Commit Graph

2162 Commits

Author SHA1 Message Date
weizhihong
3dcc6b5a66 【语音操作改为Base64上传】 2022-08-12 13:27:17 +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
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
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
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
a90973fa2c Merge remote-tracking branch 'origin/test' into test 2022-08-09 17:28:02 +08:00
tiger_zhou
50bb136082 Merge branch 'test-zhouyin' into test-training2 2022-08-09 17:21:32 +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
6ba11083eb 修改新实训数据结构 2022-08-09 13:49:16 +08:00
17fbc6ae51 定义新实训数据结构 2022-08-09 10:27:22 +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