tiger_zhou
|
4d991d82ab
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-01 13:58:23 +08:00 |
|
tiger_zhou
|
e646435e04
|
车务管理终端功能代码调整及计划支持股道，出入口与站细不一致的支持
|
2022-09-01 13:57:43 +08:00 |
|
xzb
|
e643b7df9f
|
大铁调度命令数据流转实现
|
2022-09-01 10:39:49 +08:00 |
|
weizhihong
|
11095aa217
|
【保存实训最后运行状态】
|
2022-08-31 17:10:32 +08:00 |
|
weizhihong
|
da9355b9a7
|
【优化实训运行、增加步骤定位信息字段】
|
2022-08-31 16:53:34 +08:00 |
|
weizhihong
|
d55d038c06
|
【结束实训返回分数、保存步骤时保存人员信息、重新开始时重置仿真状态】
|
2022-08-31 13:34:03 +08:00 |
|
weizhihong
|
ea3667a80d
|
【再次加载实训没有背景BUG、判断完成条件BUG】
|
2022-08-31 11:03:20 +08:00 |
|
weizhihong
|
4ce9d4b885
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/services/training2/Training2Service.java
|
2022-08-31 10:49:30 +08:00 |
|
weizhihong
|
cc4463ef5f
|
【修改步骤、操作运行状态】
|
2022-08-31 10:44:29 +08:00 |
|
|
|
ff0827c811
|
实训评分规则数据及逻辑
|
2022-08-30 17:41:21 +08:00 |
|
xzb
|
05ec596d1d
|
添加实训相关sql建表脚本
|
2022-08-30 16:04:54 +08:00 |
|
xzb
|
bed5a7aa69
|
Training2DraftService优化
|
2022-08-30 14:31:20 +08:00 |
|
xzb
|
9a3cc981de
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-30 14:22:42 +08:00 |
|
xzb
|
a2d5c6b007
|
Training2DraftService优化
|
2022-08-30 14:21:35 +08:00 |
|
weizhihong
|
4ddf7b99d5
|
【增加实训无背景加载判断】
|
2022-08-30 14:21:11 +08:00 |
|
weizhihong
|
15a5cdf6c9
|
【实训再开始时，重新加载背景】
|
2022-08-30 13:40:35 +08:00 |
|
weizhihong
|
db4a3f10c8
|
【结束实训时，不存在实训BUG】
|
2022-08-30 13:18:19 +08:00 |
|
weizhihong
|
9e42a4ce68
|
Merge branch 'test' into test-training2
|
2022-08-29 18:15:02 +08:00 |
|
xzb
|
75f7d95285
|
Station 实训相关注解
|
2022-08-29 16:52:17 +08:00 |
|
xzb
|
8aaf7c6d34
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-29 15:57:24 +08:00 |
|
xzb
|
3221f12f37
|
ExpConditionMaterialSrcAnno 添加属性name
|
2022-08-29 15:57:04 +08:00 |
|
weizhihong
|
0f0cf18e13
|
【操作中增加运行状态】
|
2022-08-29 14:42:49 +08:00 |
|
weizhihong
|
a3ed402eba
|
【增加步骤执行状态】
|
2022-08-29 13:38:52 +08:00 |
|
tiger_zhou
|
a45f64d71c
|
车务管理终端功能代码调整
|
2022-08-29 13:34:48 +08:00 |
|
weizhihong
|
90d4acbdb5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-29 10:37:21 +08:00 |
|
weizhihong
|
5b9423cf8e
|
【前端调用完成步骤中的操作】
|
2022-08-29 10:37:04 +08:00 |
|
|
|
68726b9939
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-29 10:32:41 +08:00 |
|
|
|
3b486e9016
|
实训评分规则数据结构和使用逻辑修改
|
2022-08-29 10:32:29 +08:00 |
|
weizhihong
|
8c3293ae68
|
【保存步骤时保存背景】
|
2022-08-29 10:29:56 +08:00 |
|
weizhihong
|
7a58ec24ab
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-29 10:23:51 +08:00 |
|
weizhihong
|
1e15bb8ee3
|
【修改步骤并保存仿真背景】
|
2022-08-29 10:23:45 +08:00 |
|
xzb
|
f6ba06871b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-29 10:22:23 +08:00 |
|
xzb
|
1c58b60417
|
实训添加字段final_scenes_json
|
2022-08-29 10:22:05 +08:00 |
|
tiger_zhou
|
feb4b1532c
|
车务管理终端功能代码调整
|
2022-08-29 09:56:18 +08:00 |
|
weizhihong
|
12dc16c0b5
|
【修改实训加载BUG】
|
2022-08-29 09:37:59 +08:00 |
|
|
|
a94b1ac3b0
|
实训评分规则使用逻辑
|
2022-08-26 17:10:32 +08:00 |
|
weizhihong
|
7669f34480
|
【修改客户端属性名称】
|
2022-08-26 15:48:53 +08:00 |
|
weizhihong
|
b1ab8e8bef
|
【客户端操作参数类型修改】
|
2022-08-26 13:57:04 +08:00 |
|
xzb
|
410deb28e3
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-26 11:30:37 +08:00 |
|
xzb
|
b0be1b4293
|
实训相关接口请求字段添加校验
|
2022-08-26 11:30:25 +08:00 |
|
weizhihong
|
46668187d1
|
【增加客户端操作参数】
|
2022-08-26 10:59:10 +08:00 |
|
weizhihong
|
ccea35cbc4
|
【无背景时加载BUG】
|
2022-08-26 10:14:34 +08:00 |
|
weizhihong
|
88fe625fc9
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-26 10:12:45 +08:00 |
|
weizhihong
|
e8df5e8ee6
|
【编辑车站条件属性注解】
|
2022-08-26 10:12:39 +08:00 |
|
|
|
eb1e3f35a1
|
实训评分规则定义
|
2022-08-26 10:00:01 +08:00 |
|
|
|
5349361450
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-26 09:51:46 +08:00 |
|
xzb
|
09699c5c09
|
Section 添加ExpConditionMaterialAnno
|
2022-08-26 09:42:16 +08:00 |
|
xzb
|
590aa51529
|
Route 添加ExpConditionMaterialAnno
|
2022-08-26 09:36:44 +08:00 |
|
xzb
|
1f9875b7fb
|
ExpConditionMaterialAnno完善注释
|
2022-08-26 09:17:08 +08:00 |
|
|
|
f06bfa9e4e
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Station.java
|
2022-08-25 17:50:45 +08:00 |
|
