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
|
14835db67b
|
仿真清除数据调整
|
2020-07-08 18:06:22 +08:00 |
|
fan
|
62430ea87b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 17:36:43 +08:00 |
|
fan
|
050fc8141c
|
设备登录调整
|
2020-07-08 17:36:32 +08:00 |
|
sunzhenyu
|
eff2657d08
|
修改综合演练屏蔽门直接显示
|
2020-07-08 17:24:38 +08:00 |
|
fan
|
3196304f1c
|
调整虚拟屏蔽门登录跳转路径
|
2020-07-08 16:43:18 +08:00 |
|
fan
|
5edd9f536e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 16:30:06 +08:00 |
|
fan
|
5b1aad5fc7
|
调整虚拟屏蔽门配置
|
2020-07-08 16:29:40 +08:00 |
|
sunzhenyu
|
faa57eb3c9
|
修改三维设备切换模型bug
|
2020-07-08 16:15:35 +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 |
|
sunzhenyu
|
6c1c6a8574
|
修改三维cctv综合演练样式
|
2020-07-08 14:08:22 +08:00 |
|
sunzhenyu
|
0f39cbd2e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 14:07:32 +08:00 |
|
fan
|
49cd6213c9
|
调整cctv登录路径
|
2020-07-08 14:05:46 +08:00 |
|
sunzhenyu
|
2cbe94a16d
|
修改cctv无贴图配置
|
2020-07-08 14:04:14 +08:00 |
|
fan
|
3ba4ebe807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:49:23 +08:00 |
|
fan
|
db5c516813
|
成员参数调整
|
2020-07-08 13:49:14 +08:00 |
|
sunzhenyu
|
7d8f4e6de2
|
修改三维设备在设备管理中显示样式
|
2020-07-08 13:28:06 +08:00 |
|
sunzhenyu
|
37a323ff23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:19:49 +08:00 |
|
sunzhenyu
|
3161e256b8
|
修改设备界面query
|
2020-07-08 13:19:40 +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 |
|
fan
|
b3ce617230
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 11:09:36 +08:00 |
|
fan
|
413307d6a5
|
操作类型调整
|
2020-07-08 11:09:26 +08:00 |
|
zyy
|
b58a4afdda
|
调整列车过滤
|
2020-07-08 10:56:14 +08:00 |
|
zyy
|
6a14aaeace
|
调整大屏退出流程
|
2020-07-08 10:41:28 +08:00 |
|
zyy
|
6c1e78be50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:33:31 +08:00 |
|
zyy
|
6112d720be
|
调整贵州项目大屏配置
|
2020-07-08 10:33:15 +08:00 |
|
fan
|
d863e88a70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:31:56 +08:00 |
|
fan
|
de617cde50
|
设备登录调整&试卷管理调整
|
2020-07-08 10:31:33 +08:00 |
|
sunzhenyu
|
73d1af19d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 10:21:24 +08:00 |
|
sunzhenyu
|
9c0df60188
|
三维编辑器修改，三维cctv仿真结束登出
|
2020-07-08 10:21:14 +08:00 |
|
joylink_cuiweidong
|
eb6aca6114
|
剧本录制接口调整
|
2020-07-08 09:39:25 +08:00 |
|
joylink_cuiweidong
|
2121bcbb76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 09:22:10 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
fan
|
4d30e317c6
|
合并代码
|
2020-07-07 19:02:16 +08:00 |
|
fan
|
086e56c1a7
|
设备登录调整
|
2020-07-07 19:00:48 +08:00 |
|
zyy
|
9416ae6729
|
调整判断
|
2020-07-07 18:49:14 +08:00 |
|
zyy
|
db230c2622
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 18:33:59 +08:00 |
|
zyy
|
3c34494608
|
调整试卷班级关系
|
2020-07-07 18:33:43 +08:00 |
|
joylink_cuiweidong
|
f4f5173ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/system/deviceManage/editConfig.vue
|
2020-07-07 18:26:56 +08:00 |
|
joylink_cuiweidong
|
ac9a39f94c
|
设备管理代码调整
|
2020-07-07 18:25:05 +08:00 |
|