Commit Graph

405 Commits

Author SHA1 Message Date
fan
94f70eea65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:02:24 +08:00
fan
d1a5669999 运行图预览初始化调整 2020-08-03 10:02:12 +08:00
zyy
b1fb2a12dc 调整样式 2020-08-03 09:53:34 +08:00
fan
517270b2f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 18:57:46 +08:00
fan
3215bec260 运行图调整 2020-07-31 18:57:27 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
zyy
f1d72d0968 调整综合演练流程 2020-07-30 18:42:41 +08:00
zyy
e4c20b1bf8 调整老版地图绘制文件位置 2020-07-30 17:49:20 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
fan
f13ba95407 宁波菜单回车快捷键(区段、信号机、车站)&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整 2020-07-28 18:28:31 +08:00
fan
0ad13f9fe8 宁波菜单弹框回车快捷键 2020-07-28 16:28:55 +08:00
zyy
42d9906550 调整地图加载多余配置,增加宁波右键列车新指令 2020-07-27 18:04:47 +08:00
fan
a9233a082e 代码调整 2020-07-23 17:57:35 +08:00
joylink_cuiweidong
597822430e 剧本预览代码调整 2020-07-22 17:20:24 +08:00
zyy
ed9815393a 调整线路列车右键操作 2020-07-21 15:11:33 +08:00
joylink_cuiweidong
a5df03f7c7 退出登陆 断开socket连接 2020-07-16 13:22:33 +08:00
joylink_cuiweidong
28261153df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:52:52 +08:00
joylink_cuiweidong
8d41a5d730 剧本发布暂时去掉了审核
socket断线重连代码调整
2020-07-14 16:51:22 +08:00
sunzhenyu
9352cac2b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:03:38 +08:00
sunzhenyu
54a773aa84 修改录制三维驾驶托管模块 2020-07-14 15:03:31 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
sunzhenyu
006fd8f0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 09:25:11 +08:00
sunzhenyu
f1cab6fba3 test 2020-07-14 09:24:58 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
joylink_cuiweidong
57125367fc 剧本编制与剧本预览代码调整 2020-07-13 10:15:44 +08:00
joylink_cuiweidong
bf7ae6684e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:33:55 +08:00
joylink_cuiweidong
fe3ca3af2f 剧本编制代码调整 2020-07-10 17:33:37 +08:00
zyy
e6e0bb6d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:23:31 +08:00
zyy
1c98da6c11 调整路由配置 2020-07-10 17:23:17 +08:00
joylink_cuiweidong
5deef9fe6b 剧本编制代码调整 2020-07-10 17:14:30 +08:00
joylink_cuiweidong
2b5b21c1cf 剧本编制 角色列表代码调整 2020-07-10 16:40:42 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
fan
4098cba048 heb替换hyd 2020-07-09 18:04:11 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
fan
22f94f7ef5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:47:07 +08:00
fan
81be7e776d 设备登录调整 2020-07-09 15:46:52 +08:00
joylink_cuiweidong
763d04d630 剧本编制 切换角色 过滤掉不在线的司机 2020-07-09 15:09:18 +08:00
joylink_cuiweidong
dac800a86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:36:07 +08:00
joylink_cuiweidong
b1005fd2ac 剧本编制代码调整 2020-07-08 18:35:46 +08:00
fan
14835db67b 仿真清除数据调整 2020-07-08 18:06:22 +08:00
fan
421e591f52 Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
#	src/layout/components/Title.vue
#	src/views/demonstration/detail/index.vue
2020-07-07 09:47:21 +08:00
fan
a9b3f614c8 聊天室调整 2020-07-07 09:39:27 +08:00
fan
9883d0ed3c 聊天室调整 2020-07-06 18:00:44 +08:00
zyy
6be93b39ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:02:31 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
fan
75e838b96f 聊天室调整 2020-07-03 18:42:29 +08:00
joylink_cuiweidong
654b79fc27 故障操作代码调整 2020-07-03 17:13:24 +08:00