Commit Graph

1576 Commits

Author SHA1 Message Date
DU
015adfcc95 教学相关修改 2021-01-12 11:44:35 +08:00
92a2d39318 Merge remote-tracking branch 'origin/test' into test 2021-01-11 20:09:59 +08:00
b6c1672542 列车移动曲线计算兼容逻辑区段限速 2021-01-11 20:09:52 +08:00
DU
ec6cb89ce0 教学bug 2021-01-11 20:02:12 +08:00
DU
d72beb1e93 Merge remote-tracking branch 'origin/test' into test1 2021-01-11 17:37:49 +08:00
DU
d0284659d8 课程考试关联班级修改 2021-01-11 17:32:24 +08:00
DU
a584304f21 Revert "Revert "删除表sql""
This reverts commit eaa5d94b
2021-01-11 17:32:01 +08:00
DU
d0907a8d06 Revert "Revert "默认课程考试不分是否所属单位始终展示""
This reverts commit 537d2a68
2021-01-11 17:31:48 +08:00
DU
88c79ab763 Revert "Revert "单位部门成员数据管理关联课程考试""
This reverts commit f9a541f4
2021-01-11 17:31:28 +08:00
4f950543dd 用戶连接司机视角后发送一次列车完整hmi数据,否则第一次进司机视角列车状态显示不正确 2021-01-11 16:37:42 +08:00
2618913522 修改<从发布地图新建草稿没有复制目的地码数据>bug 2021-01-11 11:27:28 +08:00
f5f8df1e28 苏电院初始化时关闭响铃 2021-01-10 20:35:40 +08:00
cbde7f7e40 苏电院真实设备逻辑修改 2021-01-10 16:23:31 +08:00
f9a541f492 Revert "单位部门成员数据管理关联课程考试"
This reverts commit c6f0df8b
2021-01-09 20:16:18 +08:00
537d2a68f5 Revert "默认课程考试不分是否所属单位始终展示"
This reverts commit 5d65b4d5
2021-01-09 20:15:50 +08:00
eaa5d94be5 Revert "删除表sql"
This reverts commit 23e3820e
2021-01-09 20:15:22 +08:00
6caf775a8e Merge remote-tracking branch 'origin/test' into master-huawei 2021-01-09 19:51:21 +08:00
1d3409fb45 苏电院修改响铃时长 2021-01-09 19:47:54 +08:00
f49d344553 Merge remote-tracking branch 'origin/test' into test 2021-01-09 19:26:57 +08:00
88de80d11b 苏电院真实设备逻辑修改 2021-01-09 19:26:41 +08:00
DU
23e3820e00 删除表sql 2021-01-08 18:12:25 +08:00
DU
5d65b4d50d 默认课程考试不分是否所属单位始终展示 2021-01-08 18:09:47 +08:00
DU
c6f0df8b18 单位部门成员数据管理关联课程考试 2021-01-08 18:00:51 +08:00
fdd51383f4 Merge remote-tracking branch 'origin/test' into test 2021-01-08 15:32:06 +08:00
DU
8b64fde956 仿真会话bug修复 2021-01-07 19:33:01 +08:00
DU
61f2003f27 Merge remote-tracking branch 'origin/test' into test 2021-01-07 09:28:04 +08:00
DU
0ceee901a6 iscs加数据判断接口,车站实训生成背景更换,自动故障列车到达区段条件修改 2021-01-07 09:15:14 +08:00
39482d6b1d 苏电院屏蔽门调试 2021-01-05 17:47:55 +08:00
fa376fdfa3 Merge branch 'test' into restruct 2021-01-04 18:23:51 +08:00
c94ad846ce 仿真真实设备模拟逻辑开发 2021-01-04 18:22:14 +08:00
df1f83c789 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-31 18:23:58 +08:00
13cc8e9bf8 Merge remote-tracking branch 'origin/test' into test 2020-12-31 18:23:23 +08:00
50fb1fc564 仿真抽象 2020-12-31 18:22:58 +08:00
DU
d1e339a307 Merge remote-tracking branch 'origin/test' into test 2020-12-31 18:01:26 +08:00
DU
2434905228 实训适配新操作 2020-12-31 18:01:09 +08:00
f473304fe6 Merge remote-tracking branch 'origin/test' into test 2020-12-31 16:30:17 +08:00
32bb3e691e 控制模式判断bug修改 2020-12-31 16:30:02 +08:00
DU
2149d85ede Merge remote-tracking branch 'origin/test' into test 2020-12-31 13:45:22 +08:00
DU
55e2731634 试卷过期查询bug修改 2020-12-31 13:44:59 +08:00
0a53d304aa 导入导出添加ISCS数据 2020-12-31 09:53:03 +08:00
57c9fcc04f Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:52:38 +08:00
eadc8ccc8c 删除用户配置表数据库相关对象和相关接口 2020-12-30 16:51:50 +08:00
a25e3dc6f2 Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:18:02 +08:00
6cac955c4c 国赛场景添加权限控制 2020-12-30 16:17:51 +08:00
9aa83aab76 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 14:39:11 +08:00
21406a1726 修改文件上传路径 2020-12-30 14:37:19 +08:00
4127d7d58b Merge remote-tracking branch 'origin/test' into test 2020-12-30 11:00:58 +08:00
d93934d9da 修改微信服务获取token接口调用 2020-12-30 11:00:27 +08:00
DU
ae12063980 试卷定义列表名称查询bug修改 2020-12-30 10:58:25 +08:00
7dd24fd938 Merge remote-tracking branch 'origin/test' into test 2020-12-30 10:42:52 +08:00