|
|
9562c726e3
|
仿真使用情况记录
|
2020-12-08 11:23:35 +08:00 |
|
|
|
15166c7fbd
|
Merge branch 'master' into test
|
2020-12-07 19:23:22 +08:00 |
|
|
|
29875967a6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-07 15:27:01 +08:00 |
|
|
|
ad822784d5
|
仿真数据校验bug修改
|
2020-12-07 15:26:32 +08:00 |
|
|
|
fcea49db2b
|
客流添加列车PIS消息
|
2020-12-07 14:55:03 +08:00 |
|
|
|
90ba9c9696
|
用户管理分页查询sql bug修改
|
2020-12-07 10:40:52 +08:00 |
|
|
|
a7a58a5abc
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:59:29 +08:00 |
|
|
|
f73148c5a3
|
生成实训不删除用户考试数据
|
2020-12-04 20:58:08 +08:00 |
|
|
|
cbdb41ac0d
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:12:38 +08:00 |
|
|
|
b4876fa189
|
生成课程、考试时：如果课程下有试卷，不生成试卷；如果没有试卷，生成默认试卷
|
2020-12-04 20:10:58 +08:00 |
|
|
|
64f5ec3d7b
|
接收/交出控制权：整个集中站范围内的车站一起
|
2020-12-04 17:06:30 +08:00 |
|
|
|
712b08d450
|
用户管理界面更新用户信息bug修改
|
2020-12-03 19:57:26 +08:00 |
|
|
|
e799f3c5da
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# sql/20201203.sql
# src/main/java/club/joylink/rtss/services/training/generatornew/base/SignalGeneratorNew.java
|
2020-12-03 19:22:24 +08:00 |
|
|
|
d4e31b01e0
|
用户和单位
|
2020-12-03 19:19:24 +08:00 |
|
|
|
ea86955e6f
|
引导进路办理实训不生成
|
2020-12-03 19:18:13 +08:00 |
|
DU
|
b2f6c6a71d
|
实训bug相关修改
|
2020-12-03 11:01:50 +08:00 |
|
|
|
2eb8da551d
|
贵州装备导入学生自动给权限（一年，由赵杰分发）
|
2020-12-02 18:34:43 +08:00 |
|
|
|
fd869b3ed7
|
公司添加管理者逻辑bug修改
|
2020-12-02 16:09:33 +08:00 |
|
|
|
708ffdeb3c
|
公司查询逻辑bug修改
|
2020-12-02 15:34:05 +08:00 |
|
|
|
16946294a1
|
添加公司管理员
|
2020-12-02 12:03:30 +08:00 |
|
|
|
700e6274f0
|
修改tls版本
|
2020-12-02 12:01:30 +08:00 |
|
|
|
76889f8411
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-02 11:27:42 +08:00 |
|
|
|
fdf340be55
|
修改tls版本
|
2020-12-02 11:27:21 +08:00 |
|
DU
|
f74b5822ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-02 09:39:13 +08:00 |
|
DU
|
5c257f5745
|
用户查询增加单位项
|
2020-12-02 09:39:04 +08:00 |
|
|
|
b72588b6ab
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-01 19:05:58 +08:00 |
|
|
|
ed00cee495
|
联锁生成逻辑——侧防数据生成逻辑开发（未完成）
|
2020-12-01 19:05:40 +08:00 |
|
DU
|
083ba77f99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-01 18:36:13 +08:00 |
|
DU
|
f2a137379b
|
导入试题提示修改
|
2020-12-01 18:36:04 +08:00 |
|
|
|
7fe6e84da3
|
微信小程序code过期错误类型修改
|
2020-12-01 14:24:09 +08:00 |
|
|
|
dbfd391799
|
分页查询用户信息添加单位名称字段
|
2020-11-30 17:51:22 +08:00 |
|
|
|
5eddc4d8e0
|
《实训生成时，未根据prdType筛选》bug修改（考试开始的bug同时消除）；开始考试效率优化
|
2020-11-30 17:12:54 +08:00 |
|
|
|
bbeaa73c14
|
添加根据地图查绘图数据接口
|
2020-11-27 18:13:38 +08:00 |
|
|
|
ab03faa02b
|
根据mapId获取地图数据接口修改
|
2020-11-27 17:49:24 +08:00 |
|
|
|
f564935c40
|
理论题导入bug修改
|
2020-11-27 17:18:23 +08:00 |
|
|
|
34c1616a4c
|
理论题导入bug修改
|
2020-11-27 17:00:52 +08:00 |
|
|
|
5d743425e5
|
生成课程速度优化
|
2020-11-27 16:11:05 +08:00 |
|
|
|
91e23f39fc
|
信号机自排关和进路自动触发实训生成逻辑分开
|
2020-11-27 15:06:02 +08:00 |
|
|
|
76df1f7cd0
|
Merge branch 'training-bug' into test
|
2020-11-27 14:11:28 +08:00 |
|
|
|
788988a3e6
|
添加客流视图开关及通信流程
|
2020-11-27 14:04:22 +08:00 |
|
|
|
f2ad219264
|
实训生成bug修改；课程&考试生成去掉没有实训的章节
|
2020-11-27 13:16:20 +08:00 |
|
|
|
e3304dbe24
|
添加正式环境docker构建文件
|
2020-11-26 19:42:35 +08:00 |
|
|
|
a2ca5c5981
|
信号总取消操作修改；课程查询逻辑修改
|
2020-11-26 19:03:32 +08:00 |
|
|
|
ac6a2750df
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:18:32 +08:00 |
|
|
|
0afb167ca7
|
语音文件添加类型
|
2020-11-26 18:18:17 +08:00 |
|
|
|
215a6bafd0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:10:32 +08:00 |
|
|
|
9e4d63f3c2
|
仿真websocket订阅重构，同时修复仿真上线/下线事件逻辑，应该不会再出现进入大屏再关闭大屏标签页导致用户下线继而导致仿真销毁问题
仿真抽象对象添加抽象仿真用户
|
2020-11-26 18:10:16 +08:00 |
|
|
|
5892cad910
|
语音文件上传保存bug修改
|
2020-11-26 14:16:21 +08:00 |
|
|
|
13ddd0f01a
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 13:49:04 +08:00 |
|
|
|
ed6c7809ac
|
语音识别的文件保存的bug修改；本地部署的导入导出修改（未测试）
|
2020-11-26 13:48:48 +08:00 |
|
