Commit Graph

1157 Commits

Author SHA1 Message Date
joylink_cuiweidong
2b5b21c1cf 剧本编制 角色列表代码调整 2020-07-10 16:40:42 +08:00
joylink_cuiweidong
c432c8ffcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 14:46:38 +08:00
joylink_cuiweidong
54a5a29f26 剧本预览代码调整 2020-07-10 14:46:18 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +08:00
zyy
9def448e4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:56:16 +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
joylink_cuiweidong
4c307cc848 剧本编制代码调整 2020-07-10 10:53:44 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
joylink_cuiweidong
40fe41a8ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:36:35 +08:00
joylink_cuiweidong
e13fcb02e5 故障设置代码调整 2020-07-10 10:36:10 +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
joylink_cuiweidong
0c9cd52c9a 剧本编制代码调整 2020-07-09 17:39:43 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
joylink_cuiweidong
ffab9631ce 代码调整 2020-07-09 15:45:32 +08:00
joylink_cuiweidong
84485c6f1d 剧本编制代码调整 2020-07-09 15:44:12 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
joylink_cuiweidong
c315f9121a 剧本编制代码调整 2020-07-09 10:50:56 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
joylink_cuiweidong
3cd9d9416b 剧本代码调整 2020-07-08 18:56:32 +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
zyy
3693994526 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:35:25 +08:00
zyy
c4ffc859ce 调整大屏配置逻辑,登陆权限流程 2020-07-08 18:35:12 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +08:00
fan
050fc8141c 设备登录调整 2020-07-08 17:36:32 +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
4a5923f263 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:11:36 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
joylink_cuiweidong
fe3ee372e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:05:53 +08:00
joylink_cuiweidong
fc97643116 剧本编制代码调整 2020-07-08 13:05:09 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
joylink_cuiweidong
eb6aca6114 剧本录制接口调整 2020-07-08 09:39:25 +08:00
joylink_cuiweidong
30b1163017 故障代码调整
设备代码调整
2020-07-08 09:21:54 +08:00
zyy
e710e5eb34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 17:37:59 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37:45 +08:00
joylink_cuiweidong
00a4a8c184 自动设置故障(zc故障)代码调整 2020-07-07 17:08:01 +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