|
|
a90b557f0b
|
Merge remote-tracking branch 'origin/test-ncc' into test-ncc
|
2023-02-15 18:35:14 +08:00 |
|
|
|
53898cf270
|
添加模块
|
2023-02-15 18:34:32 +08:00 |
|
tiger_zhou
|
0e23653da5
|
更改jdk，boot版本，修改配置
|
2023-02-15 18:04:57 +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 |
|
weizhihong
|
382d28ca31
|
【实训道岔定反、单锁解、转动联动验证处理】
|
2023-02-10 18:26:44 +08:00 |
|
|
|
0a817bdb82
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-10 17:09:57 +08:00 |
|
|
|
47a9e54e16
|
仿真基础信息增加联动道岔数据
|
2023-02-10 17:09:34 +08:00 |
|
weizhihong
|
6791174f2b
|
【车站分散自律操作模式方式切换处理】【簿册背景保存】
|
2023-02-10 16:50:13 +08:00 |
|
tiger_zhou
|
4dc1fd6b09
|
场景考试
|
2023-02-10 16:06:14 +08:00 |
|
tiger_zhou
|
8b491a0233
|
场景考试
|
2023-02-10 15:45:28 +08:00 |
|
|
|
df4ea3ed59
|
修改大铁加载列车条件
|
2023-02-10 14:00:07 +08:00 |
|
|
|
f668c04919
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-10 11:16:19 +08:00 |
|
|
|
265bb3284c
|
因三维无法维护，故决定将司机操作在ATS界面执行，所以需要[司机不是机器人则操作无效]此类限制；增加单元测试
|
2023-02-10 11:16:04 +08:00 |
|
weizhihong
|
e3d0169bbe
|
【增加电力工务角色】
|
2023-02-09 17:36:04 +08:00 |
|
weizhihong
|
4d5bc197fd
|
【实训修改为场景类型时，清空地图定位】
|
2023-02-09 16:22:39 +08:00 |
|
weizhihong
|
e9c3b3fd57
|
【车站功能选择切换操作】
|
2023-02-09 15:21:58 +08:00 |
|
weizhihong
|
5dd0fff5cc
|
【实训短时间多操作触发处理，实训时间控制】
|
2023-02-09 14:14:26 +08:00 |
|
tiger_zhou
|
52477be1a1
|
单操考试调整
|
2023-02-08 15:58:44 +08:00 |
|
tiger_zhou
|
899c5e2e0f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-02-08 15:26:03 +08:00 |
|
