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 |
|
fan
|
0fd852cc5a
|
聊天室调整
|
2020-07-07 10:54:57 +08:00 |
|
joylink_cuiweidong
|
92da104ad0
|
zc故障灯状态修改
|
2020-07-07 10:00:55 +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 |
|
joylink_cuiweidong
|
a6b2f62c3e
|
北京一成都线路手动设置zc故障
|
2020-07-06 18:45:15 +08:00 |
|
zyy
|
8d09215323
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 18:18:13 +08:00 |
|
joylink_cuiweidong
|
bcc24751b4
|
手动zc故障代码调整
|
2020-07-06 18:17:44 +08:00 |
|
zyy
|
642027a42f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 18:17:03 +08:00 |
|
zyy
|
67edc61d0e
|
调整大屏分屏预览页面
|
2020-07-06 18:16:49 +08:00 |
|
fan
|
87d8dd9ea7
|
聊天室调整
|
2020-07-06 18:14:03 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
joylink_cuiweidong
|
dd8e0f650e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:49:35 +08:00 |
|
joylink_cuiweidong
|
5f1a5b3092
|
西安线路和宁波一号线添加动手zc故障
|
2020-07-06 17:49:17 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
joylink_cuiweidong
|
5cf1fdab5d
|
新版地图右键操作代码调整
|
2020-07-06 15:40:59 +08:00 |
|
joylink_cuiweidong
|
75244ca959
|
任何创建者 创建试卷 有试用选项
|
2020-07-06 13:31:49 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
joylink_cuiweidong
|
ebf86de377
|
故障操作代码调整
|
2020-07-03 18:39:24 +08:00 |
|
joylink_cuiweidong
|
9bef909f27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 18:14:49 +08:00 |
|
joylink_cuiweidong
|
9d85fa7eca
|
信号机绘图代码调整
|
2020-07-03 18:14:24 +08:00 |
|
sunzhenyu
|
2a0a45ccef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 17:24:48 +08:00 |
|
sunzhenyu
|
937fc4b1f9
|
修复通号三维重复显示设备间bug
|
2020-07-03 17:24:41 +08:00 |
|
joylink_cuiweidong
|
147f2570ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 17:13:44 +08:00 |
|