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 |
|
fan
|
276d2a8cdf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 18:23:04 +08:00 |
|
fan
|
85210dbf18
|
设备登录调整
|
2020-07-07 18:22:54 +08:00 |
|
joylink_cuiweidong
|
8d18151425
|
登陆页面代码调整
|
2020-07-07 17:54:11 +08:00 |
|
fan
|
a543aa79d1
|
设备登录调整
|
2020-07-07 17:45:26 +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 |
|
joylink_cuiweidong
|
e0eb8f30dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:30:23 +08:00 |
|
joylink_cuiweidong
|
e2af1335a3
|
修改枚举
|
2020-07-07 16:30:06 +08:00 |
|
zyy
|
2d9bfeee2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:17:44 +08:00 |
|
zyy
|
bb500d4c29
|
调整贵州装备试卷关系，样式
|
2020-07-07 16:17:29 +08:00 |
|
joylink_cuiweidong
|
b1bca0a1df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:09:29 +08:00 |
|
joylink_cuiweidong
|
3480ebb7b0
|
设备管理代码调整
|
2020-07-07 16:09:14 +08:00 |
|
fan
|
ed92adad02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 16:08:03 +08:00 |
|
fan
|
9dd81d0fd1
|
实训类型调整
|
2020-07-07 16:07:48 +08:00 |
|
joylink_cuiweidong
|
02d486c1af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 15:43:46 +08:00 |
|
joylink_cuiweidong
|
c345a60997
|
项目登陆路径调整（变成 design/login?project=xxx）
|
2020-07-07 15:42:56 +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
|
5dc5b256bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 10:55:07 +08:00 |
|