Commit Graph

2231 Commits

Author SHA1 Message Date
weizhihong
a3ed402eba 【增加步骤执行状态】 2022-08-29 13:38:52 +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
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
ba1dfb77a2 Merge remote-tracking branch 'origin/test' into test-training2
# Conflicts:
#	pom.xml
2022-08-25 17:35:15 +08:00
xzb
622ac0338e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-25 17:03:04 +08:00
xzb
a9bf1832bf 实训草稿条件表达式中“条件”的获取优化 2022-08-25 17:02:48 +08:00
weizhihong
de3c493c42 【实训属性条件注解增加】 2022-08-25 16:54:57 +08:00
308c9c1754 Merge remote-tracking branch 'origin/test' into test 2022-08-25 16:51:10 +08:00
fc1f4c5511 修改调车进路生成逻辑;增加长调车进路生成逻辑 2022-08-25 16:50:56 +08:00
tiger_zhou
d541f85aee 车务管理终端功能代码调整 2022-08-25 16:24:01 +08:00
xzb
653bf208b0 实训草稿条件表达式中“条件”的获取优化 2022-08-25 16:21:52 +08:00
xzb
02468a10b0 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-25 15:52:29 +08:00
xzb
aaf852db59 实训草稿条件表达式中“条件”的获取 2022-08-25 15:52:00 +08:00
tiger_zhou
9d1a8c2fa5 车务管理终端功能代码调整及径路更新,提交功能 2022-08-25 15:26:16 +08:00
weizhihong
a3e9d7faf0 【修改表达式数据格式】 2022-08-25 14:22:47 +08:00
tiger_zhou
37a8451173 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin 2022-08-25 08:56:56 +08:00
33217b868f 大铁生成子系统增加综合演练 2022-08-24 18:35:19 +08:00
tiger_zhou
d8eb3dd50f 车务管理终端功能代码调整 2022-08-24 18:03:46 +08:00
weizhihong
36def8ce7a 【仿真加载实训】 2022-08-24 16:39:45 +08:00
xzb
b1a5415720 实训草稿分页查询添加过滤条件mapId 2022-08-24 16:07:33 +08:00
xzb
a784fc278b routepath 筛选异常时打印 2022-08-24 15:56:21 +08:00
7f870d52ce Merge remote-tracking branch 'origin/test' into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
2022-08-24 15:26:18 +08:00
b4470f92c9 修改大铁调车进路生成逻辑 2022-08-24 13:57:14 +08:00
0e4f0b7b83 增加武汉项目 2022-08-24 11:14:10 +08:00
tiger_zhou
ab8f0d3556 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin 2022-08-24 09:07:31 +08:00
xzb
41c7130489 已发布实训管理 2022-08-23 16:22:42 +08:00
xzb
dd9996a895 实训草稿保存、保存草稿地图定位;已发布实训根据mapId获取、根据已发布实训id或实训完整信息 2022-08-23 13:20:18 +08:00