Commit Graph

197 Commits

Author SHA1 Message Date
joylink_cuiweidong
57ffa85451 剧本预览代码调整 2020-07-21 10:49:01 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
fan
23885760f3 会话调整 2020-07-20 13:38:54 +08:00
fan
00a98a5b14 merger 2020-07-20 13:29:32 +08:00
fan
6f20f4db18 会话调整 2020-07-20 13:18:38 +08:00
fan
826b4da854 公共会话切换 2020-07-20 10:48:53 +08:00
joylink_cuiweidong
39eace3b40 剧本预览代码调整 2020-07-20 10:28:31 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00
fan
c761e07ba2 设备配置调整 2020-07-16 13:31:05 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整
绘图高级页面代码调整
2020-07-14 18:21:40 +08:00
zyy
b2f9e388aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:14:53 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
fan
9efc0d4bfb 成员管理高度调整 2020-07-14 17:30:35 +08:00
fan
286d38db5c 会话调整 2020-07-14 17:21:39 +08:00
zyy
c2d158da5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:35:19 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
fan
135fe2d917 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:32:29 +08:00
fan
0db415d5ca 北信坤成页面调整&&综合演练会话调整 2020-07-14 15:32:18 +08:00
zyy
dfc478b8d4 调整哈尔滨综合演练按钮位置,调整角色设置样式 2020-07-14 14:30:37 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
fan
1b3a491d52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:35:07 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +08:00
zyy
6cc8b3beaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
2020-07-10 10:55:48 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
sunzhenyu
3a25657440 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:28:01 +08:00
sunzhenyu
3e84301b42 修改综合演练切换带三维界面的处理 2020-07-10 10:27:49 +08:00
fan
0d5be61a17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:00:51 +08:00
fan
ac3da3ef00 成员管理总数在线人数调整 2020-07-10 10:00:20 +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