Commit Graph

3471 Commits

Author SHA1 Message Date
d1635f0c4e 上次提交的补充 2023-02-03 13:46:03 +08:00
e8ccdef987 修改[大铁进路解锁时,有些锁定道岔未解锁]问题 2023-02-03 13:35:17 +08:00
weizhihong
7c7c87cc5e 【大铁线路根据车次查询列车编号】 2023-02-02 16:15:19 +08:00
weizhihong
581def3bb3 【大铁出入口判断进路开放逻辑修改】 2023-02-02 14:05:24 +08:00
weizhihong
a3d245346f 【防洪安全上岗签到表添加接口】 2023-02-02 10:16:49 +08:00
fff58f8ec4 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-02-01 17:51:11 +08:00
7e85189deb 生成的【调度台】线路功能不再具有成员管理菜单 2023-02-01 17:50:56 +08:00
weizhihong
5d08b5bd1e 【行车设备施工登记簿、交接班记录簿(区段站、中间站、外勤助理、调车区长、调度员、车号长)录入查询】 2023-02-01 14:46:40 +08:00
weizhihong
86f8820453 【行车设备施工登记簿信息】 2023-01-31 18:02:36 +08:00
tiger_zhou
b4e785284f 试卷生成理论题调整 2023-01-31 14:13:44 +08:00
tiger_zhou
712da01cc3 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-31 14:13:19 +08:00
tiger_zhou
68bbde3029 考试规则数量,标签 针对实训线路过滤调整 2023-01-31 10:57:44 +08:00
weizhihong
ce21de71ba 【非正常情况接发列车关键环节控制表信息保存、更新、查询操作】 2023-01-31 10:42:15 +08:00
tiger_zhou
fc5b8721b7 考试生成试卷,考试规则数量,标签 针对实训线路过滤 2023-01-31 10:11:45 +08:00
tiger_zhou
40875c44db Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-31 10:08:18 +08:00
5337333402 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-30 17:42:15 +08:00
8d9e571566 修改大铁调车进路生成逻辑 2023-01-30 17:42:01 +08:00
tiger_zhou
9c360f0788 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-30 17:21:55 +08:00
tiger_zhou
a5691df153 调整考试实训类型类型属性无法找到问题 2023-01-30 11:11:23 +08:00
weizhihong
6f9d9bf5b7 【修改出入口卡控默认值】 2023-01-30 09:40:01 +08:00
2a9d51d629 Merge remote-tracking branch 'origin/master' 2023-01-29 15:39:03 +08:00
weizhihong
39d7bd76bf 【实训更新步骤是用户角色列表自然排序】 2023-01-18 14:44:01 +08:00
weizhihong
27adab3586 【大铁列车到点上线逻辑修改】 2023-01-18 10:19:36 +08:00
weizhihong
97184b1867 【大铁调度命令背景保存】 2023-01-17 16:43:57 +08:00
a0580a6435 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-17 15:54:33 +08:00
94e6169138 增加仿真加载草稿运行图接口 2023-01-17 15:54:16 +08:00
weizhihong
327c883c5b 【大铁调度台重置方法】 2023-01-17 14:16:51 +08:00
456d0d8f1f 修改加载实训时的重置仿真接口 2023-01-17 10:21:41 +08:00
689ab3155a Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-16 16:09:33 +08:00
6857404403 地图数据增加可访问客户端集合;大铁重置仿真增加按计划行车(之前认为大铁应自动按计划行车) 2023-01-16 16:09:22 +08:00
weizhihong
929c9a1e05 【大铁实训保存背景BUG】 2023-01-16 16:00:15 +08:00
tiger_zhou
7aabe2822b training2 合并 2023-01-16 10:46:10 +08:00
tiger_zhou
f85636942d Merge remote-tracking branch 'origin/test-training2' into test
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
#	src/main/resources/application.yml
2023-01-16 10:33:52 +08:00
tiger_zhou
10b1a9f125 权限代码调整 2023-01-13 18:17:23 +08:00
tiger_zhou
8d07023419 权限代码调整 2023-01-13 17:47:47 +08:00
tiger_zhou
3a859527d8 权限分发支持 组织,项目,用户创建仿真对组织,项目权限的验证 2023-01-13 17:32:49 +08:00
tiger_zhou
8c10192b57 三方登录调整 2023-01-13 10:36:16 +08:00
tiger_zhou
731bd470e3 支持三方账号权限验证 2023-01-12 18:33:17 +08:00
tiger_zhou
f4acd77850 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-12 18:32:49 +08:00
tiger_zhou
b76aaaac77 对项目权限不验证验证配置 2023-01-11 18:02:14 +08:00
weizhihong
e308fb1067 【调整实训设备数目】 2023-01-11 17:59:16 +08:00
tiger_zhou
d88ffb7437 添加 对jjjlm,teaching项目权限的过滤取消 2023-01-11 17:38:07 +08:00
46c5fa05f4 修改试卷数据处理接口 2023-01-11 17:14:31 +08:00
650625c19f Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-11 16:17:46 +08:00
4dce82edb8 修改删减组织关联的项目时会删除所有关联关系的bug 2023-01-11 16:17:32 +08:00
tiger_zhou
31c46f8832 实训用户管理,数据管理可分页 2023-01-11 16:09:43 +08:00
weizhihong
2817af5adb 【修改实训生成设置】 2023-01-11 16:04:08 +08:00
tiger_zhou
a4eb84d63a 武汉8修改默认角色 2023-01-11 14:38:17 +08:00
8fb8671300 修改数据处理接口;修改大铁地图功能分组 2023-01-11 10:47:12 +08:00
90238254ee 修改地图功能默认描述 2023-01-10 18:16:39 +08:00