Commit Graph

164 Commits

Author SHA1 Message Date
sunzhenyu
3e84301b42 修改综合演练切换带三维界面的处理 2020-07-10 10:27:49 +08:00
sunleking
07d9f8603d 修改hideibp隐藏三维界面 2020-07-09 21:44:11 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +08:00
zyy
6ff8019898 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 15:49:41 +08:00
zyy
fd89fe974e 调整列车驾驶设备 2020-07-08 15:49:16 +08:00
fan
e8d54bc1d0 合并代码 2020-07-08 15:42:23 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
zyy
7c8d1319f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:40:18 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00
fan
db5c516813 成员参数调整 2020-07-08 13:49:14 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
joylink_cuiweidong
30b1163017 故障代码调整
设备代码调整
2020-07-08 09:21:54 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37:45 +08:00
fan
f83a60bd88 聊天室调整 2020-07-07 14:58:10 +08:00
fan
aced111815 聊天室调整 2020-07-07 14:11:04 +08:00
joylink_fanyuhong
24daf6aea1 聊天室调整 2020-07-07 13:15:20 +08:00
fan
0fd852cc5a 聊天室调整 2020-07-07 10:54:57 +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
87d8dd9ea7 聊天室调整 2020-07-06 18:14:03 +08:00
fan
9883d0ed3c 聊天室调整 2020-07-06 18:00:44 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
fan
75e838b96f 聊天室调整 2020-07-03 18:42:29 +08:00
fan
872122e92b 综合演练仿真调整 2020-07-02 17:57:48 +08:00
joylink_cuiweidong
50c7363791 故障操作代码调整 2020-07-02 10:10:16 +08:00
fan
13a4ee614c 综合演练仿真调整 2020-07-01 18:52:29 +08:00
fan
ce180b1448 综合演练仿真调整 2020-06-30 18:35:57 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +08:00
fan
8f4cecec0c 综合演练调整 2020-06-30 14:27:32 +08:00
joylink_cuiweidong
f6982eb966 解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
2020-06-29 17:33:19 +08:00
fan
a689103abe 综合演练调整 2020-06-29 13:11:27 +08:00
fan
103ae24b64 仿真成员管理 2020-06-29 09:12:30 +08:00
fan
4f248c3b19 综合演练界面调整&项目配置整理 2020-06-28 14:27:28 +08:00
fan
d7a5b555a2 设备登录调整 2020-06-24 18:40:48 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +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
556d7fa109 仿真右侧列车显示代码调整 2020-06-17 15:31:15 +08:00
zyy
28cc15fd10 调整综合监控数据,调整系统右键菜单样式 2020-06-15 17:16:26 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
joylink_cuiweidong
cb3663722f 代码调整 2020-06-11 09:43:02 +08:00
zyy
e688625887 调整大屏高度计算 2020-06-10 17:59:51 +08:00
fan
9b489d088b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 16:57:04 +08:00
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
joylink_cuiweidong
b169bb1e20 佛山有轨电车指令代码调整 2020-06-10 13:24:12 +08:00
sunzhenyu
a18a7bccc6 merge jointtrainningnew/index.vue 2020-06-08 18:26:30 +08:00
sunzhenyu
b33f4c17b2 merge pull 2020-06-08 18:24:09 +08:00