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 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
sunzhenyu
|
8213999c4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 16:35:50 +08:00 |
|
sunzhenyu
|
75d754e56c
|
修改通号三维视角
|
2020-07-03 16:35:43 +08:00 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|
sunzhenyu
|
2282376acf
|
修改通号三维bug
|
2020-07-03 16:29:07 +08:00 |
|
zyy
|
ab94e1f981
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 15:19:12 +08:00 |
|
zyy
|
8a5845749e
|
调整绘图流程逻辑 删除多余配置
|
2020-07-03 15:18:58 +08:00 |
|
fan
|
8fa62ec9ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 13:55:20 +08:00 |
|
fan
|
0a594f5e09
|
屏蔽门故障打开
|
2020-07-03 13:55:04 +08:00 |
|
sunzhenyu
|
92d39f28ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 13:49:13 +08:00 |
|
sunzhenyu
|
0b08bfae9f
|
综合演练三维通号增加设备间，三维编辑器资源管理链接配置
|
2020-07-03 13:49:05 +08:00 |
|
fan
|
b98f811998
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:28:44 +08:00 |
|
fan
|
9142ea7e40
|
获取项目下所有设备接口还原
|
2020-07-03 11:28:26 +08:00 |
|
joylink_cuiweidong
|
41cc1af21a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:27:29 +08:00 |
|
joylink_cuiweidong
|
ec1c5a9bbb
|
信号机故障 绘图代码调整
|
2020-07-03 11:27:01 +08:00 |
|
zyy
|
84937e8c5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 11:12:10 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
fan
|
aa66cbb277
|
列车驾驶模式显示调整
|
2020-07-03 11:02:35 +08:00 |
|
fan
|
671dff4016
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 10:37:41 +08:00 |
|
fan
|
189c649a89
|
调整因缓存路由导致的项目进入其他地图页面错误
|
2020-07-03 10:37:33 +08:00 |
|
joylink_cuiweidong
|
92c10db690
|
剧本录制代码调整
|
2020-07-03 09:46:26 +08:00 |
|
fan
|
e9e5cf4b56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-03 09:26:27 +08:00 |
|
fan
|
63bac7ecf3
|
铁科院登录调整
|
2020-07-03 09:26:17 +08:00 |
|