Commit Graph

2523 Commits

Author SHA1 Message Date
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
0ef764591a 修改大铁子系统生成名称 2022-08-23 11:25:23 +08:00
0433273f35 修改停稳倒计时实现逻辑 2022-08-23 10:04:17 +08:00
xzb
5d4bb2a63d PageQueryVO.pageNum添加注释 2022-08-23 09:37:19 +08:00
tiger_zhou
6e862173b8 车务管理终端功能代码调整 2022-08-22 16:36:23 +08:00
weizhihong
aa1f8021c3 【实训参演角色设置】 2022-08-22 16:00:39 +08:00
weizhihong
f27e2dab8a 【实训运行逻辑修改,增加单操时角色的默认选定】 2022-08-22 14:55:09 +08:00
xzb
c687f0a322 删除获取所有实训草稿信息的接口 2022-08-22 13:07:01 +08:00
xzb
fd43bbcc30 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-22 12:16:09 +08:00
xzb
a831d0cccf 添加实训修改背景接口 2022-08-22 12:15:47 +08:00
weizhihong
74317a0744 【单操角色设置】 2022-08-22 10:45:13 +08:00
weizhihong
f9276e2632 【实训步骤对象】 2022-08-22 09:08:35 +08:00
tiger_zhou
bd45e46e80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin
 Conflicts:
	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
2022-08-19 17:53:03 +08:00
tiger_zhou
59b92ea0c3 车务管理终端功能 2022-08-19 17:50:38 +08:00
weizhihong
b6fd23d036 【实训步骤、操作基本流程逻辑】 2022-08-19 14:53:41 +08:00
weizhihong
8243193972 【实训预览操作】 2022-08-18 16:03:43 +08:00
xzb
51d1a2f665 已发布实训管理接口-删除实训 2022-08-18 14:43:40 +08:00
xzb
281b1acdf3 已发布实训管理接口实现 2022-08-18 14:08:11 +08:00
xzb
c7047614ca 已发布实训管理接口定义 2022-08-18 10:45:59 +08:00