tiger_zhou
|
8728d9ffa0
|
Merge branch 'test-training2'
|
2023-02-20 09:27:44 +08:00 |
|
tiger_zhou
|
eb81ea59dc
|
用户登录不显示个人权限
|
2023-02-20 09:25:48 +08:00 |
|
tiger_zhou
|
94c07b26dc
|
Merge branch 'test-training2'
|
2023-02-17 18:42:55 +08:00 |
|
tiger_zhou
|
75a1fa43cc
|
权限时间调整
|
2023-02-17 18:42:02 +08:00 |
|
tiger_zhou
|
9b12e5adcb
|
Merge remote-tracking branch 'origin/test-training2'
|
2023-02-17 18:19:03 +08:00 |
|
tiger_zhou
|
f074c4db94
|
权限时间调整
|
2023-02-17 18:16:59 +08:00 |
|
weizhihong
|
5d3a8905c2
|
【单操实训增加组织过滤】【项目过滤无效项目】
|
2023-02-17 17:42:25 +08:00 |
|
weizhihong
|
977834cd4e
|
【分散自律操作模式切换BUG处理】
|
2023-02-17 15:34:47 +08:00 |
|
weizhihong
|
eac12826d1
|
【分散自律同意、不同意逻辑处理】
|
2023-02-17 14:21:52 +08:00 |
|
weizhihong
|
aad3a16d5b
|
【车站控制操作模式BUG处理】
|
2023-02-17 09:56:45 +08:00 |
|
|
|
9f28c2f8ee
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 17:30:21 +08:00 |
|
|
|
ae801cb061
|
修改机器人驾驶代码使逻辑更清晰，并解决地铁线路站台轨不停车的问题
|
2023-02-16 17:30:00 +08:00 |
|
weizhihong
|
3cc442b0fa
|
【车站模式申请消息返回格式修改】
|
2023-02-16 14:10:18 +08:00 |
|
weizhihong
|
8cfa715e37
|
【修改实训运行逻辑：只有在场景情况下判断等待时间】
|
2023-02-16 13:33:14 +08:00 |
|
|
|
233b1b1ff2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 11:13:27 +08:00 |
|
|
|
33dc36a6af
|
修改地图功能默认描述；增加批量修改地图功能描述接口
|
2023-02-16 11:12:03 +08:00 |
|
weizhihong
|
e748120a8d
|
【实训执行逻辑、更新步骤参数修改】
|
2023-02-15 18:13:53 +08:00 |
|
weizhihong
|
6689da99ee
|
【区故解延时解锁，增加进路锁闭条件】
|
2023-02-15 17:09:43 +08:00 |
|
|
|
cf5b5e8919
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 17:08:02 +08:00 |
|
tiger_zhou
|
963d0e0710
|
考试调整
|
2023-02-15 16:57:43 +08:00 |
|
|
|
b409263cf8
|
修改ATS界面开关门操作，使用更直接的逻辑
|
2023-02-15 15:26:47 +08:00 |
|
|
|
a45f0a3295
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 14:11:01 +08:00 |
|
|
|
7bc7fdeaee
|
地图功能增加bgUrl返回
|
2023-02-15 14:10:44 +08:00 |
|
tiger_zhou
|
db0ba127ed
|
试卷场景分数调整
|
2023-02-15 13:43:16 +08:00 |
|
weizhihong
|
be8c515eea
|
【车站操作模式转换逻辑调整】
|
2023-02-15 12:55:44 +08:00 |
|
|
|
55c93799c2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 11:19:36 +08:00 |
|
|
|
2f162fdaaa
|
地图功能增加背景图片url；修改ATS界面开关门操作以确保成功
|
2023-02-15 11:19:25 +08:00 |
|
weizhihong
|
ddb5f69705
|
【车站模式操作支持多车站切换】
|
2023-02-15 11:07:22 +08:00 |
|
weizhihong
|
2d59c54f87
|
【模式申请增加超过两分钟直接驳回处理】
|
2023-02-15 10:30:54 +08:00 |
|
|
|
5aec3edb8d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 09:54:43 +08:00 |
|
|
|
a3846f459b
|
修改列车停站后无法开站台门bug
|
2023-02-15 09:54:30 +08:00 |
|
tiger_zhou
|
6a0a8477f2
|
应急ws调整
|
2023-02-14 17:43:32 +08:00 |
|
|
|
6d37169068
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-14 17:33:44 +08:00 |
|
|
|
8463e2ff57
|
ATS的开关门操作增加修改门选择逻辑
|
2023-02-14 17:33:32 +08:00 |
|
tiger_zhou
|
5cb582f23c
|
应急ws调整
|
2023-02-14 14:19:14 +08:00 |
|
tiger_zhou
|
007e479755
|
应急ws调整
|
2023-02-14 13:34:06 +08:00 |
|
tiger_zhou
|
a0419ab218
|
应急ws调整
|
2023-02-14 13:25:38 +08:00 |
|
tiger_zhou
|
8eaf0206d0
|
考试调整，应急ws调整
|
2023-02-14 11:29:28 +08:00 |
|
|
|
85e678e90f
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-14 11:10:09 +08:00 |
|
|
|
4618aa502e
|
修改测试环境minio配置
|
2023-02-14 11:09:21 +08:00 |
|
weizhihong
|
47956c3a79
|
【字符串修改成枚举】
|
2023-02-14 10:44:12 +08:00 |
|
weizhihong
|
5bdad2aaa7
|
【增加保存背景时车站的属性】
|
2023-02-13 17:48:04 +08:00 |
|
tiger_zhou
|
e00957e92d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-02-13 16:59:13 +08:00 |
|
tiger_zhou
|
1f6d31649e
|
应急调度速度显示调整
|
2023-02-13 16:58:54 +08:00 |
|
tiger_zhou
|
8a50f9a380
|
应急调度速度显示调整
|
2023-02-13 16:42:38 +08:00 |
|
|
|
7ab99bea9c
|
Merge branch 'test' into test-training2
|
2023-02-13 15:12:31 +08:00 |
|
tiger_zhou
|
9f8b47147d
|
修改用户登录前端有时无法获取orgId,
考试调整
|
2023-02-13 14:36:08 +08:00 |
|
|
|
a52faffc4f
|
处理报错
|
2023-02-13 14:31:07 +08:00 |
|
|
|
3aeeba78cf
|
Merge remote-tracking branch 'origin/test' into test
|
2023-02-13 11:22:29 +08:00 |
|
|
|
12ad180057
|
Merge branch 'test-training2' into test
|
2023-02-13 10:11:59 +08:00 |
|
