Commit Graph

3415 Commits

Author SHA1 Message Date
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
f1004dd52a 剧本编制代码调整 2020-06-23 15:15:46 +08:00
joylink_cuiweidong
df475ab28a 剧本编制修改会话代码调整 2020-06-23 14:17:35 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
68624ba8ac 剧本编制修改会话代码调整 2020-06-23 10:27:18 +08:00
zyy
88211cee8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 09:27:10 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
joylink_cuiweidong
d789a30333 剧本编制代码调整 2020-06-22 18:37:09 +08:00
joylink_cuiweidong
d3d17f7bf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 14:30:14 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
fan
5cfec3e09f 课程创建角色可以直接发布课程&&sockjs恢复版本 2020-06-22 10:49:41 +08:00
fan
ab6b0036d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 09:49:58 +08:00
fan
0f519c8a89 贵装备导入学生信息后刷新班级列表 2020-06-22 09:49:45 +08:00
joylink_cuiweidong
9cb46f16b7 剧本添加动作类型Drive 2020-06-19 19:08:33 +08:00
joylink_cuiweidong
ba05a22eb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:59:13 +08:00
joylink_cuiweidong
32f4ead036 剧本代码调整 2020-06-19 18:58:55 +08:00
fan
2f996e10e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:39:51 +08:00
fan
4d3a1eed73 项目设备管理调整 2020-06-19 18:39:41 +08:00
zyy
06bbc69389 删除老版本绘图 2020-06-19 18:19:45 +08:00
fan
df983b2cb9 项目设备管理调整 2020-06-19 18:02:50 +08:00
joylink_cuiweidong
9138fab486 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 13:01:35 +08:00
joylink_cuiweidong
100c651068 剧本代码调整 2020-06-19 11:30:12 +08:00
sunzhenyu
4a831d4aa7 merge baseurl 2020-06-19 11:26:40 +08:00
sunzhenyu
45c96bd76f 修改三维驾驶录制界面中托管按钮 2020-06-19 11:23:47 +08:00
fan
3a4641f06f 合并代码 2020-06-19 10:24:11 +08:00
fan
f0ae68d94a 登录接口调整 2020-06-19 10:23:13 +08:00
joylink_cuiweidong
090d2bdfc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 10:07:54 +08:00
joylink_cuiweidong
ad756eee10 剧本编制代码调整 2020-06-19 10:06:58 +08:00
sunzhenyu
3e21c2827c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 09:56:53 +08:00
sunzhenyu
2a50dd1be2 修改三维驾驶刷新重连列车bug 2020-06-19 09:56:40 +08:00
joylink_cuiweidong
f2a3867ed8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 18:50:34 +08:00
joylink_cuiweidong
d9f6d515fd 剧本添加司机的指令操作 2020-06-18 18:49:19 +08:00
sunzhenyu
03716c5ed3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 18:40:56 +08:00
sunzhenyu
8b2c0cc00a 修改三维驾驶通信接口改post 2020-06-18 18:40:47 +08:00
joylink_cuiweidong
04b9f6062a 去掉断点 2020-06-18 14:38:33 +08:00
joylink_cuiweidong
7b9fe40dbd 剧本代码调整 2020-06-18 14:36:23 +08:00
joylink_cuiweidong
4c99069752 剧本代码调整 2020-06-18 14:19:13 +08:00
joylink_cuiweidong
426aed9ef1 剧本代码调整 2020-06-18 09:20:42 +08:00
joylink_cuiweidong
eefbf70002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:36:45 +08:00
joylink_cuiweidong
0983307bc7 剧本代码调整 2020-06-17 18:36:22 +08:00
sunzhenyu
47d77d6925 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:17:00 +08:00
sunzhenyu
b70feae183 增加三维驾驶超速报警和牵引状态mmi显示,增加剧本设计中三维驾驶 2020-06-17 18:16:49 +08:00
joylink_cuiweidong
068fc65f3d 剧本代码调整 2020-06-17 15:33:04 +08:00
joylink_cuiweidong
556d7fa109 仿真右侧列车显示代码调整 2020-06-17 15:31:15 +08:00
joylink_cuiweidong
283206e55d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 14:19:07 +08:00