tiger_zhou
|
753c314292
|
武汉8号线列车位置显示功能
|
2022-09-07 10:01:58 +08:00 |
|
tiger_zhou
|
7065625895
|
Merge branch 'test' into test-training2-zhouyin
|
2022-09-07 08:58:05 +08:00 |
|
tiger_zhou
|
6a3c4ad645
|
武汉8号线列车位置显示功能
|
2022-09-07 08:57:34 +08:00 |
|
xzb
|
a7ff59fc91
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-06 18:03:11 +08:00 |
|
xzb
|
52ac4d1d63
|
调度命令
|
2022-09-06 18:02:56 +08:00 |
|
weizhihong
|
eb84b0cf15
|
【实训指标计算】
|
2022-09-06 17:10:09 +08:00 |
|
xzb
|
e9cc4510b4
|
调度命令
|
2022-09-06 16:59:28 +08:00 |
|
xzb
|
8ac5de29eb
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-05 18:19:55 +08:00 |
|
xzb
|
335590cd0c
|
调度命令
|
2022-09-05 18:19:34 +08:00 |
|
weizhihong
|
6a76691b2c
|
【实训消息修改为事件触发、增加指标计算流程事件】
|
2022-09-05 16:53:28 +08:00 |
|
tiger_zhou
|
786e0e58a9
|
车务管理终端功能代码调整
|
2022-09-05 15:32:16 +08:00 |
|
tiger_zhou
|
67938c6597
|
武汉8号线区段添加公里标属性
|
2022-09-05 15:13:37 +08:00 |
|
xzb
|
a20441b1ec
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-05 13:06:43 +08:00 |
|
xzb
|
9d0677cf51
|
实训草稿发布重命名
|
2022-09-05 13:06:22 +08:00 |
|
tiger_zhou
|
fbdbd33e49
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-05 12:27:55 +08:00 |
|
tiger_zhou
|
5c4dc62ac8
|
车务管理终端功能代码调整
|
2022-09-05 12:25:30 +08:00 |
|
xzb
|
a1a6d69d8f
|
大铁调度命令-select
|
2022-09-05 11:18:01 +08:00 |
|
xzb
|
43898ba1f2
|
大铁调度命令-receiversManager
|
2022-09-05 09:24:12 +08:00 |
|
xzb
|
9c3b6487cd
|
大铁调度命令
|
2022-09-02 18:05:08 +08:00 |
|
xzb
|
71d735a7cb
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-02 18:04:45 +08:00 |
|
weizhihong
|
b0ed14c484
|
【区段故障类型反序列化问题】
|
2022-09-02 17:29:03 +08:00 |
|
weizhihong
|
84955a996b
|
【草稿同名检验、发布同名检验】
|
2022-09-02 16:48:43 +08:00 |
|
weizhihong
|
2486637175
|
【个人草稿添加时重名判断】
|
2022-09-02 15:59:05 +08:00 |
|
weizhihong
|
8d195c5367
|
【前端重复点击时、后端报错问题】
|
2022-09-02 11:10:22 +08:00 |
|
tiger_zhou
|
7411b52328
|
Merge branch 'test-training2-zhouyin' into test-training2
|
2022-09-02 09:31:59 +08:00 |
|
tiger_zhou
|
98742d923a
|
车务管理终端功能代码调整
|
2022-09-02 09:31:19 +08:00 |
|
weizhihong
|
8e6060eaa2
|
【优化实训加载速度，结束后直接获取下一步】
|
2022-09-01 18:39:33 +08:00 |
|
xzb
|
6922e2630e
|
大铁调度命令数据流转实现
|
2022-09-01 18:09:38 +08:00 |
|
tiger_zhou
|
5e4d85443d
|
车务管理终端功能代码调整
|
2022-09-01 18:03:06 +08:00 |
|
tiger_zhou
|
efb101d281
|
车务管理终端功能代码调整
|
2022-09-01 17:31:38 +08:00 |
|
tiger_zhou
|
9d1677128f
|
Merge branch 'test-zhouyin' into test-training2-zhouyin
|
2022-09-01 14:00:03 +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
|
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 |
|
|
|
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 |
|
xzb
|
b50142cdd4
|
实训草稿发布业务
|
2022-08-17 18:05:56 +08:00 |
|
xzb
|
f2fcd2f6ea
|
实训发布表生成的实体、dao、xml
|
2022-08-17 16:29:18 +08:00 |
|
xzb
|
b9222c262f
|
实训草稿分页获取，更新草稿分更新基础信息和更新大字段信息
|
2022-08-17 15:24:56 +08:00 |
|
|
|
d510fb990b
|
区段增加停稳倒计时逻辑及状态
|
2022-08-17 13:24:09 +08:00 |
|
|
|
7a0ae0426b
|
修改操作计数逻辑；区段数据增加停稳倒计时显示位置
|
2022-08-17 13:23:10 +08:00 |
|
xzb
|
e57bf757ac
|
注掉华为voice
|
2022-08-17 11:21:34 +08:00 |
|
|
|
6ff50fa08c
|
增加引导总锁后办理引导直接开放信号及取消引导总锁后关闭信号逻辑；修改驾驶操作越引导无效bug
|
2022-08-17 10:33:21 +08:00 |
|
xzb
|
cc2e07d24a
|
获取当前用户的某个实训草稿的所有信息
|
2022-08-17 10:29:36 +08:00 |
|
xiazengbin
|
39549dd426
|
training2
|
2022-08-17 09:07:46 +08:00 |
|
xiazengbin
|
fbe1b0b891
|
实训草稿基本操作
|
2022-08-16 18:03:51 +08:00 |
|
|
|
aaa7e414bc
|
车站中增加计数器；仿真Members和Users改为有序Map
|
2022-08-16 17:10:02 +08:00 |
|
weizhihong
|
ed441f7b06
|
【步骤成员ID】
|
2022-08-16 16:55:51 +08:00 |
|
weizhihong
|
11b124efc6
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/controller/training2/TrainingDraftV2Controller.java
# src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
|
2022-08-16 16:12:27 +08:00 |
|
weizhihong
|
f4457f737b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/controller/training2/TrainingV2Controller.java
# src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
|
2022-08-16 16:10:18 +08:00 |
|
xiazengbin
|
54868de8c2
|
创建实训草稿
|
2022-08-16 16:07:18 +08:00 |
|
weizhihong
|
07454c3a0b
|
【实训步骤编辑、查询】
|
2022-08-16 15:52:31 +08:00 |
|
xiazengbin
|
8440643eab
|
training2
|
2022-08-16 15:42:49 +08:00 |
|
xiazengbin
|
3ba7fa5916
|
training2
|
2022-08-16 14:54:15 +08:00 |
|
xiazengbin
|
f4c7f29df1
|
training2 table
|
2022-08-16 14:32:37 +08:00 |
|
xiazengbin
|
459d2caf23
|
training2
|
2022-08-16 13:57:40 +08:00 |
|
xiazengbin
|
77c10de68d
|
draft training2 数据库定义相关
|
2022-08-16 13:55:18 +08:00 |
|
|
|
f9f9c998ec
|
修改注解
|
2022-08-16 13:25:30 +08:00 |
|
|
|
d98fdd15cb
|
删除实训数据中的operaJson；增加Valuable新实现
|
2022-08-16 13:20:10 +08:00 |
|
|
|
cee7197c70
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-16 11:10:06 +08:00 |
|
|
|
45e5ad302b
|
新实训数据结构修改中
|
2022-08-16 11:09:52 +08:00 |
|
weizhihong
|
b1606676e2
|
【新增消息类型语音、文字】
|
2022-08-16 10:43:20 +08:00 |
|
weizhihong
|
8bf5a4b807
|
Merge branch 'test' into test-training2
|
2022-08-16 10:28:46 +08:00 |
|
|
|
1e69db5a5e
|
新实训数据结构修改中
|
2022-08-15 17:47:02 +08:00 |
|
tiger_zhou
|
f3df206427
|
修改：添加车辆停靠车站时，车门关闭后向前行驶一点的问题，因为车头偏移小于目标偏移（设定）
|
2022-08-15 17:19:01 +08:00 |
|
weizhihong
|
33203131b2
|
【增加Train_Drive命令，后续切换完成后，将Train_Trust删除】
|
2022-08-15 15:05:20 +08:00 |
|
weizhihong
|
e5db5e02f4
|
【切换为RM模式后，再次切换AM死循环问题】
|
2022-08-15 14:04:05 +08:00 |
|
|
|
73a1ad2e3d
|
新实训数据结构修改中
|
2022-08-15 10:58:45 +08:00 |
|
weizhihong
|
35236a831a
|
【回库折返轨判断】
|
2022-08-15 10:33:46 +08:00 |
|
|
|
18d9d72347
|
新实训数据结构修改中
|
2022-08-15 09:33:34 +08:00 |
|
|
|
8e1e491fca
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 16:45:12 +08:00 |
|
|
|
d600df6381
|
新实训数据结构修改中
|
2022-08-12 16:45:02 +08:00 |
|
|
|
ad6fd2ac37
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-12 15:48:07 +08:00 |
|
|
|
ebdcd4362c
|
信号按钮增加有无计数器字段
|
2022-08-12 15:47:43 +08:00 |
|
weizhihong
|
bc5f414193
|
【文字输入会话枚举类型BUG】
|
2022-08-12 15:28:15 +08:00 |
|
tiger_zhou
|
c4c803428c
|
进路延期取消的时候，不能手动取消进路
|
2022-08-12 14:24:20 +08:00 |
|
weizhihong
|
9cbfb97d98
|
【会话文件上传后增加返回结果】
|
2022-08-12 13:53:33 +08:00 |
|
tiger_zhou
|
ad180a4355
|
列车进路延时解锁时间180S,调车进路延时解锁为30S
|
2022-08-12 13:46:02 +08:00 |
|
weizhihong
|
2ba34056dc
|
【删除多余代码】
|
2022-08-12 13:33:27 +08:00 |
|
weizhihong
|
e865770a4b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-12 13:27:22 +08:00 |
|
weizhihong
|
3dcc6b5a66
|
【语音操作改为Base64上传】
|
2022-08-12 13:27:17 +08:00 |
|
xiazengbin
|
8c1dee2202
|
组合进路-通过进路信号
|
2022-08-12 13:07:44 +08:00 |
|
xiazengbin
|
fbcf1e645e
|
merge
|
2022-08-12 11:31:35 +08:00 |
|
xiazengbin
|
4fe596c803
|
组合进路
|
2022-08-12 11:11:49 +08:00 |
|
|
|
e3fc0efeaf
|
新实训数据结构修改中
|
2022-08-12 11:04:00 +08:00 |
|
|
|
cc2c667e40
|
修改大铁通过进路生成的信号显示
|
2022-08-12 11:00:37 +08:00 |
|
|
|
782788e0e9
|
修改大铁通过进路生成的信号显示
|
2022-08-12 10:58:35 +08:00 |
|
|
|
0580471208
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 10:40:59 +08:00 |
|
|
|
7dad6b1419
|
部分地图数据删除showConditions字段
|
2022-08-12 10:40:42 +08:00 |
|
weizhihong
|
4f9a12e7a7
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-12 10:20:23 +08:00 |
|
weizhihong
|
dc0982bc97
|
【电话操作】
|
2022-08-12 10:20:18 +08:00 |
|
|
|
6170ebc3f5
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-12 09:52:23 +08:00 |
|
|
|
8dcfce7354
|
增加<故障通知>信号按钮类型
|
2022-08-12 09:52:08 +08:00 |
|
|
|
7b9fba8412
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 09:50:28 +08:00 |
|
|
|
9c1e2cfc9d
|
增加<故障通知>信号按钮类型
|
2022-08-12 09:50:17 +08:00 |
|
weizhihong
|
5fd42ccf40
|
【电话会话操作、聊天会话操作】
|
2022-08-12 09:45:02 +08:00 |
|
tiger_zhou
|
f08f1e37ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin
|
2022-08-12 09:38:23 +08:00 |
|
tiger_zhou
|
214a4ae7d0
|
列车进路延时解锁时间180S,调车进路延时解锁为30S
|
2022-08-12 09:37:56 +08:00 |
|
xiazengbin
|
112ab6cbab
|
每次开始触发办理进路时设置开放信号显示
|
2022-08-11 17:56:34 +08:00 |
|
weizhihong
|
9a9171766b
|
【会话语音输入、文字输入操作】
|
2022-08-11 14:11:25 +08:00 |
|
weizhihong
|
efcdeaf26d
|
Merge remote-tracking branch 'remotes/origin/test' into test-training2
|
2022-08-11 13:50:31 +08:00 |
|
weizhihong
|
a95076aac1
|
【分路不良状态问题】
|
2022-08-11 13:05:15 +08:00 |
|
|
|
6a194ce09c
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-11 11:27:38 +08:00 |
|
|
|
d6b327f8cc
|
新实训增加<表达式>数据结构、实训数据增加运行图id、评分规则增加仿真成员信息
|
2022-08-11 11:27:24 +08:00 |
|
xiazengbin
|
4073382b85
|
3.233
|
2022-08-11 11:20:13 +08:00 |
|
xiazengbin
|
f0fc1fed80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzbsignal
|
2022-08-11 11:09:35 +08:00 |
|
xiazengbin
|
5476db3db3
|
signal
|
2022-08-11 09:19:10 +08:00 |
|
weizhihong
|
c2394f3eb9
|
【重置时，分路不良状态改成false】
|
2022-08-11 09:12:51 +08:00 |
|
weizhihong
|
a809059e4a
|
Merge remote-tracking branch 'remotes/origin/test' into test-training2
|
2022-08-11 08:50:59 +08:00 |
|
weizhihong
|
b25d0ab80d
|
【会话操作枚举】
|
2022-08-11 08:50:27 +08:00 |
|
weizhihong
|
54d617f77b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-08-11 08:48:46 +08:00 |
|
weizhihong
|
f754e6d07f
|
【行驶至前方站、进路闭塞行驶，合并入驾驶操作中】
|
2022-08-11 08:48:40 +08:00 |
|
|
|
0c824032c4
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 15:21:36 +08:00 |
|
|
|
26c5be81b0
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-10 15:21:07 +08:00 |
|
|
|
5326a53baa
|
草稿进路更新功能增加<离去区段占用与信号对应关系>
|
2022-08-10 15:20:55 +08:00 |
|
weizhihong
|
1e4071d79c
|
【去除角色司机限制】
|
2022-08-10 13:37:47 +08:00 |
|
weizhihong
|
a5640fb52b
|
【删除越红灯行驶、越引导信号行驶、限速、驾驶至、大铁发车、停车操作】
|
2022-08-10 13:07:57 +08:00 |
|
|
|
fb68e92e4d
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 10:03:44 +08:00 |
|
|
|
f42923f100
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:52:50 +08:00 |
|
|
|
1f3b7c65d2
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:20:51 +08:00 |
|
|
|
a90973fa2c
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-09 17:28:02 +08:00 |
|
tiger_zhou
|
50bb136082
|
Merge branch 'test-zhouyin' into test-training2
|
2022-08-09 17:21:32 +08:00 |
|
tiger_zhou
|
8131728783
|
修改操作类型的属性调整
|
2022-08-09 17:20:00 +08:00 |
|
|
|
f0ca9e9c77
|
Revert "Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据""
This reverts commit 4654dc4b71.
|
2022-08-09 17:10:00 +08:00 |
|
|
|
6ba11083eb
|
修改新实训数据结构
|
2022-08-09 13:49:16 +08:00 |
|
|
|
17fbc6ae51
|
定义新实训数据结构
|
2022-08-09 10:27:22 +08:00 |
|
tiger_zhou
|
71dadb5468
|
修改操作类型的属性调整
|
2022-08-09 10:00:36 +08:00 |
|
tiger_zhou
|
c89a2ba5e4
|
修改操作类型的属性
|
2022-08-09 09:46:20 +08:00 |
|
weizhihong
|
b2d7404f96
|
【行驶至操作】
|
2022-08-05 17:21:17 +08:00 |
|
weizhihong
|
162eedbcfd
|
【指令修改为操作】
|
2022-08-05 16:56:13 +08:00 |
|
|
|
b892606e76
|
修改local数据库配置
|
2022-08-05 16:13:26 +08:00 |
|
weizhihong
|
26f96fed02
|
【剧本信息保存实体修改】
|
2022-08-04 16:49:51 +08:00 |
|
weizhihong
|
bf22dac447
|
【保存剧本时，保存进路序列、占线板、路票、红色通行证、绿色通行证】
【股道区段用sectionCode】
【剧本会话动作删除】
|
2022-08-04 11:28:20 +08:00 |
|
|
|
4654dc4b71
|
Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据"
This reverts commit d294dfafe8.
|
2022-08-04 10:11:48 +08:00 |
|
|
|
7d9d14086a
|
修改生成大铁通过进路的逻辑
|
2022-08-03 16:38:23 +08:00 |
|
|
|
d294dfafe8
|
增加大铁发车进路信号受离去区段占用影响逻辑与数据
|
2022-08-03 13:50:25 +08:00 |
|
|
|
1f3173f393
|
会话接通消息中增加会话创建人id
|
2022-08-03 11:10:02 +08:00 |
|
xiazengbin
|
adace3d7e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-02 14:44:24 +08:00 |
|
xiazengbin
|
03b6cc1b20
|
添加段长
|
2022-08-02 14:44:14 +08:00 |
|
|
|
b9701a13ce
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-02 13:05:26 +08:00 |
|
|
|
4dcf64d9ff
|
大铁引导总锁失表道岔，可办理引导进路
|
2022-08-02 13:05:16 +08:00 |
|
weizhihong
|
97a8e522e7
|
【修改系统时间BUG修改】
|
2022-08-02 10:34:09 +08:00 |
|
weizhihong
|
c0dd13e3dd
|
【修改进路信息时，保存进路类型】
|
2022-08-02 09:42:59 +08:00 |
|
weizhihong
|
25a4c8911f
|
【接发箭头占用逻辑注释】
|
2022-08-01 17:27:27 +08:00 |
|
weizhihong
|
b159fb3ce2
|
【联锁接发车灯状态逻辑】
|
2022-08-01 17:19:40 +08:00 |
|
xiazengbin
|
b471ba466b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-01 17:12:40 +08:00 |
|
xiazengbin
|
c22c5b2691
|
fault offline
|
2022-08-01 17:12:32 +08:00 |
|
weizhihong
|
c1c734a17e
|
【进路类型保存】【站台轨分路不良状态BUG处理】
|
2022-08-01 16:42:41 +08:00 |
|
|
|
889e415ddd
|
修改大铁通过进路生成逻辑
|
2022-08-01 16:04:18 +08:00 |
|
|
|
9a757c4a7f
|
添加哈盈达大铁项目；机器人驾驶不再重复切手动位
|
2022-08-01 15:20:56 +08:00 |
|
|
|
33c89b1792
|
引导总锁状态不再禁止引导进路办理
|
2022-08-01 14:31:47 +08:00 |
|
xiazengbin
|
9ec80abc27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-01 13:41:29 +08:00 |
|
xiazengbin
|
0c71476026
|
脱线停车
|
2022-08-01 13:41:19 +08:00 |
|
|
|
45a4d6f5eb
|
修改bug
|
2022-08-01 13:19:21 +08:00 |
|
|
|
c56fbcf757
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-01 13:09:56 +08:00 |
|
|
|
156d876c73
|
修改驾驶操作限速不生效bug
|
2022-08-01 13:09:23 +08:00 |
|
xiazengbin
|
9b2411ed24
|
脱线故障停车
|
2022-08-01 13:02:25 +08:00 |
|
xiazengbin
|
ce2b3a8d7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-07-29 18:04:24 +08:00 |
|
xiazengbin
|
e66a0c204a
|
列车脱线
|
2022-07-29 17:49:29 +08:00 |
|
|
|
76652f4a4f
|
剧本不记录除驾驶、停车、换端外的所有列车驾驶相关操作
|
2022-07-29 16:51:41 +08:00 |
|
|
|
c862318813
|
自动驾驶忽略所有调车信号机
|
2022-07-29 15:29:57 +08:00 |
|
|
|
c98ff6035a
|
地图数据的表示状态增加switchCodes字段
|
2022-07-29 15:25:30 +08:00 |
|
weizhihong
|
2b2c251854
|
【区段占用，结束会话操作修改】
|
2022-07-29 11:13:24 +08:00 |
|
weizhihong
|
03760bffd3
|
【剧本会话参与者先挂电话后，会话不能结束BUG】
|
2022-07-28 17:28:24 +08:00 |
|
tiger_zhou
|
e540f54392
|
剧本司机变更不返回记录到剧本中调整
|
2022-07-28 14:48:27 +08:00 |
|
weizhihong
|
a4cfc79a30
|
【运行方向接发车灯不占用标识】
|
2022-07-28 13:34:06 +08:00 |
|
tiger_zhou
|
3b9d822f80
|
剧本司机变更不返回记录到剧本中
|
2022-07-28 11:55:31 +08:00 |
|
weizhihong
|
8e5a49628d
|
【如果会话中全部为机器人，则直接完成】
|
2022-07-28 10:55:09 +08:00 |
|
weizhihong
|
84b591ae9d
|
【在连续动作是机器人的情况下，如果音频播放完成，则动作立即结束】
|
2022-07-28 10:16:38 +08:00 |
|
|
|
38828b23e7
|
机器人驾驶、停车操作小改动
|
2022-07-27 23:02:40 +08:00 |
|
|
|
7075deb417
|
驾驶操作小改动
|
2022-07-27 22:43:19 +08:00 |
|
|
|
4eaa82ff7a
|
机器人驾驶和停车功能完善
|
2022-07-27 22:30:35 +08:00 |
|
|
|
76f10fd230
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-27 18:59:26 +08:00 |
|
|
|
280f4edd78
|
驾驶和停车操作
|
2022-07-27 18:58:17 +08:00 |
|
weizhihong
|
80301e670d
|
【移动运行方向至CI联锁文件夹】【移动行车日志至CTC文件夹】【增加进路是否调车进路属性】
|
2022-07-27 18:42:41 +08:00 |
|
weizhihong
|
06e8e2d5ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-27 15:28:38 +08:00 |
|
weizhihong
|
dd770b496b
|
【修改剧本执行时，无参数空指针BUG】
|
2022-07-27 15:28:28 +08:00 |
|
|
|
eee106a1c9
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-27 14:55:04 +08:00 |
|
|
|
7d53a5b138
|
修改剧本语音判断匹配率
|
2022-07-27 14:54:45 +08:00 |
|
weizhihong
|
fe7c8c324f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-27 14:49:42 +08:00 |
|
weizhihong
|
24517a1895
|
【行车日志反序列化BUG】
|
2022-07-27 14:49:26 +08:00 |
|
|
|
9ca26dcb00
|
百度语音接口错误码处理
|
2022-07-27 13:49:15 +08:00 |
|
xiazengbin
|
a7a047390d
|
添加配置：对信号机封锁操作，是否影响信号显示
|
2022-07-27 10:36:16 +08:00 |
|
|
|
266463eb4c
|
道岔钩锁操作联动
|
2022-07-26 15:28:52 +08:00 |
|
|
|
fc353a5fad
|
取消剧本删除动作条件
|
2022-07-26 15:08:24 +08:00 |
|
|
|
8471bd9d6e
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-26 13:22:28 +08:00 |
|
|
|
f1fc7012d9
|
增加线路配置[区故解是否只能解锁故障锁闭区段]；修改列车托管操作参数和逻辑
|
2022-07-26 13:22:10 +08:00 |
|
weizhihong
|
65aa127296
|
行车日志列车上线bug
|
2022-07-26 12:56:52 +08:00 |
|
weizhihong
|
2d9e5f2cea
|
【状态修改】
|
2022-07-26 12:24:56 +08:00 |
|
weizhihong
|
6ddc46f09d
|
【还原非通讯车占用逻辑】【行车日志添加列车时，判断是否已经上线，上线的不添加】
|
2022-07-26 12:23:22 +08:00 |
|
weizhihong
|
608631ff41
|
【设备管理员加车站属性】
|
2022-07-26 10:59:00 +08:00 |
|
weizhihong
|
6e60f7c5af
|
【修改加载剧本无行车日志BUG】
|
2022-07-26 10:02:43 +08:00 |
|
weizhihong
|
f6514cb7f1
|
角色名称置空
|
2022-07-26 09:42:52 +08:00 |
|
weizhihong
|
e3532ea8b4
|
【设备管理员】
|
2022-07-26 09:35:20 +08:00 |
|
|
|
15d7ebd7f1
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-25 18:09:08 +08:00 |
|
|
|
d6ff1c12f5
|
增加修改仿真时间接口；增加故障锁闭设置与取消
|
2022-07-25 18:08:54 +08:00 |
|
weizhihong
|
3404870ec7
|
【增加大铁角色默认列表】
|
2022-07-25 18:04:58 +08:00 |
|
weizhihong
|
808a87edb7
|
增加角色【站长、信号员、客运员、扳道员、引导员、工务工】
|
2022-07-25 16:30:19 +08:00 |
|
weizhihong
|
75f5c2b592
|
【剧本反序列化BUG】
|
2022-07-25 15:24:06 +08:00 |
|
weizhihong
|
ee5be65ad5
|
【修复反序列化CTC信息BUG】
|
2022-07-25 13:54:17 +08:00 |
|
weizhihong
|
8afd9b286f
|
【调度运行计划非空判断】
|
2022-07-25 09:29:21 +08:00 |
|
weizhihong
|
5fdcfc5fd7
|
【CTC信息剧本没有反序列化非空判断】
|
2022-07-25 09:25:50 +08:00 |
|
weizhihong
|
7ae2e6fa6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-22 19:46:45 +08:00 |
|
weizhihong
|
dcec7e339c
|
【剧本中出入口状态、行车日志信息保存】
|
2022-07-22 19:46:39 +08:00 |
|
|
|
073ad21844
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-22 16:31:34 +08:00 |
|
|
|
66995d5606
|
自动驾驶逻辑基于实体设备
|
2022-07-22 16:30:45 +08:00 |
|
|
|
66d21c1778
|
大铁增加点灯灭灯操作；大铁不执行根据信号机模式自动切换点灯灭灯状态逻辑；修改部分列车运行指令的寻路逻辑；修改停车指令结束条件；修改大铁自动驾驶寻路逻辑
|
2022-07-22 16:20:52 +08:00 |
|
weizhihong
|
0e3939b8f6
|
【闭塞后发车，列车占用显示异常解决】
|
2022-07-22 11:22:20 +08:00 |
|
|
|
ba0c05eb64
|
大铁进路人解进路去掉需要接近锁闭的条件
|
2022-07-22 09:49:35 +08:00 |
|
|
|
ad797fe758
|
大铁无计划车停站30s
|
2022-07-22 09:13:01 +08:00 |
|
|
|
5f4c20f20a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-21 17:46:55 +08:00 |
|
|
|
afbb57d1a8
|
增加大铁列车自动驾驶逻辑；将大铁不需要的仿真任务去除
|
2022-07-21 17:46:47 +08:00 |
|
weizhihong
|
ad904b95c9
|
【保存剧本时，栈溢出问题解决】
|
2022-07-21 17:36:20 +08:00 |
|
weizhihong
|
8e70759161
|
【大铁行驶过程中，检查是否还可以向前行驶】
|
2022-07-21 09:48:26 +08:00 |
|
|
|
8dcba7a311
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-20 14:10:52 +08:00 |
|
|
|
53c86eaba4
|
修改大铁进路自动触发逻辑
|
2022-07-20 14:07:48 +08:00 |
|
weizhihong
|
15e5b28c68
|
【道岔分路不良设置】
【删除多余属性】
|
2022-07-20 14:04:26 +08:00 |
|
weizhihong
|
43036bc6a5
|
【修改加车逻辑，删除多余代码】
|
2022-07-20 09:39:12 +08:00 |
|
weizhihong
|
21f02c218b
|
【行车日志变化后，回调占线板方法】
|
2022-07-19 17:12:12 +08:00 |
|
|
|
8b02960200
|
修改进路序列和股道视图以车站为单位重新生成
|
2022-07-19 17:01:10 +08:00 |
|
|
|
9d3dddb099
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-19 16:42:54 +08:00 |
|
|
|
e8a187d4bd
|
增加获取百度token接口；标记删除的阶段计划对应的进路序列和股道视图删除
|
2022-07-19 16:40:27 +08:00 |
|
weizhihong
|
18a18c78a7
|
【自动计划时间前5分钟增加列车】
|
2022-07-19 14:03:13 +08:00 |
|
weizhihong
|
bab45540de
|
【接发车口方向类型修改为字符串】
|
2022-07-19 13:40:05 +08:00 |
|
weizhihong
|
6440a36356
|
【始发计划下发后，自动接车】
|
2022-07-19 13:28:20 +08:00 |
|
|
|
2aefb71fed
|
修改大铁调车进路生成逻辑
|
2022-07-19 10:45:52 +08:00 |
|
weizhihong
|
84daf2379f
|
【去除运行日志初始消息，改为接口拉取】
|
2022-07-18 18:19:24 +08:00 |
|
|
|
987cb20325
|
修改地图功能配置的默认值
|
2022-07-18 16:40:41 +08:00 |
|
|
|
c2d04f684c
|
大铁：非常站控取消进路的自动触发逻辑；地图绘制增加配置，可配置线路是否有CTC/TDCS系统
|
2022-07-18 16:34:21 +08:00 |
|
weizhihong
|
32ae4fc71b
|
【CTC发送初始化消息去除synchronized关键字】
|
2022-07-18 16:00:11 +08:00 |
|
weizhihong
|
edb9f46753
|
【行车日志变化后回调占线板】
|
2022-07-18 15:01:14 +08:00 |
|
weizhihong
|
953e1fa6a3
|
注释
|
2022-07-18 14:23:43 +08:00 |
|
weizhihong
|
9e2022addd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-18 14:21:36 +08:00 |
|
weizhihong
|
c794758d09
|
【行车日志删除标识操作】
【行车计划同一车次限制】
|
2022-07-18 14:21:30 +08:00 |
|
|
|
8245b2f2e8
|
增加信号按钮类型枚举
|
2022-07-18 13:46:40 +08:00 |
|
|
|
e13d00e75b
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-18 13:19:19 +08:00 |
|
|
|
57ef0ec497
|
大铁线路，有CTC系统的默认自律控制
|
2022-07-18 13:19:00 +08:00 |
|
weizhihong
|
febb565223
|
【运行股道与基本径路不一致修改BUG】
|
2022-07-18 10:40:36 +08:00 |
|
weizhihong
|
6addd6d286
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-18 10:21:13 +08:00 |
|
weizhihong
|
f10a51493e
|
【总辅助抬起后，指示灯无效BUG】
|
2022-07-18 10:21:06 +08:00 |
|
|
|
a77da3cd84
|
修改进路序列路径筛选逻辑
|
2022-07-18 09:48:16 +08:00 |
|
|
|
4f0044be9c
|
修改进路序列查找进路逻辑
|
2022-07-15 18:16:06 +08:00 |
|
|
|
e683c3eb05
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-15 16:28:47 +08:00 |
|
|
|
e2cf5c630e
|
增加长兴技术学院项目
|
2022-07-15 16:28:33 +08:00 |
|
weizhihong
|
d5ab7eee4b
|
【辅助办理进路BUG】
|
2022-07-15 10:42:14 +08:00 |
|
|
|
d4f0b78154
|
Revert "修改：用户在实训平台能看到公开的课程、考试及自己所属组织下的课程、考试数据"
This reverts commit c4144e5f80.
|
2022-07-14 18:11:40 +08:00 |
|
|
|
abdf784bd9
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 18:02:28 +08:00 |
|
|
|
6f316da19b
|
修改实训平台的课程、考试查询结果
|
2022-07-14 18:02:14 +08:00 |
|
weizhihong
|
7f799ce302
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-14 17:22:53 +08:00 |
|
weizhihong
|
930638a0c6
|
【接发辅助限制条件、辅助状态下改变方向流程、修改辅助灯状态刷新逻辑】
|
2022-07-14 17:22:36 +08:00 |
|
|
|
1015f4217f
|
增加：创建考试时记录组织
|
2022-07-14 17:21:35 +08:00 |
|
|
|
35277606e8
|
增加返回值字段
|
2022-07-14 17:13:20 +08:00 |
|
|
|
87d93692e4
|
修改扫码登录bug
|
2022-07-14 16:26:51 +08:00 |
|
|
|
c4144e5f80
|
修改：用户在实训平台能看到公开的课程、考试及自己所属组织下的课程、考试数据
|
2022-07-14 16:22:25 +08:00 |
|
|
|
c6868d4e0a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 15:16:31 +08:00 |
|
weizhihong
|
9fe7bb8222
|
【改方、辅助状态限制】
|
2022-07-14 15:12:24 +08:00 |
|
|
|
9a2ffe1274
|
修改教学管理相关接口的考试、课程、评价规则的创建和查询逻辑
|
2022-07-14 14:59:31 +08:00 |
|
weizhihong
|
87f04ddb3e
|
【行车日志超限消息处理】
|
2022-07-14 13:40:25 +08:00 |
|
weizhihong
|
54a44f18e6
|
【行车日志新增运行计划时，班次BUG】
|
2022-07-14 13:15:34 +08:00 |
|
|
|
e1f1d8bc5e
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 10:16:29 +08:00 |
|
|
|
8b7f989a01
|
修改：mapFunctionConfig给默认值
|
2022-07-14 10:16:08 +08:00 |
|
weizhihong
|
6e40df6868
|
【总辅助验证条件增加】
|
2022-07-14 09:53:26 +08:00 |
|
weizhihong
|
11252f4f48
|
【辅助操作】
|
2022-07-13 17:48:51 +08:00 |
|
|
|
01c00e6bce
|
限制：修改组织名称不能和已有名称重复
|
2022-07-13 16:36:28 +08:00 |
|
|
|
7e5920dd4a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-13 16:28:55 +08:00 |
|
