sunzhenyu
|
9ff6b5f574
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 11:32:37 +08:00 |
|
sunzhenyu
|
8f8192a8f7
|
修改综合演练三维退出重定向
|
2020-07-10 11:32:26 +08:00 |
|
zyy
|
7263bb669d
|
删除socket提示信息
|
2020-07-10 11:26:15 +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 |
|
sunzhenyu
|
ca83846790
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 09:17:15 +08:00 |
|
sunzhenyu
|
ccd14e903d
|
三维编辑器修改
|
2020-07-10 09:17:00 +08:00 |
|
sunleking
|
07d9f8603d
|
修改hideibp隐藏三维界面
|
2020-07-09 21:44:11 +08:00 |
|
zyy
|
1f411d0a78
|
调整项目配置
|
2020-07-09 19:09:01 +08:00 |
|
zyy
|
1847267bef
|
调整列车大屏状态修改
|
2020-07-09 19:07:57 +08:00 |
|
zyy
|
ab2d2b004e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 18:52:25 +08:00 |
|
zyy
|
7b6148919c
|
调整综合监控默认进入第一个界面
|
2020-07-09 18:52:13 +08:00 |
|
fan
|
cb1e54b410
|
教研==》教员
|
2020-07-09 18:27:31 +08:00 |
|
fan
|
4098cba048
|
heb替换hyd
|
2020-07-09 18:04:11 +08:00 |
|
fan
|
3061b83c6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:45:02 +08:00 |
|
fan
|
3301d2bebf
|
哈尔滨打包调整
|
2020-07-09 17:44:48 +08:00 |
|
joylink_cuiweidong
|
0c9cd52c9a
|
剧本编制代码调整
|
2020-07-09 17:39:43 +08:00 |
|
fan
|
82c0cf200d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:38:27 +08:00 |
|
fan
|
81de72cab0
|
哈尔滨打包调整
|
2020-07-09 17:38:16 +08:00 |
|
sunzhenyu
|
41a0ac6ebd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 17:23:19 +08:00 |
|
joylink_cuiweidong
|
5532bc5eba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 16:54:51 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +08:00 |
|
sunzhenyu
|
f424184363
|
修改录制界面三维驾驶初始车辆显示
|
2020-07-09 16:39:58 +08:00 |
|
sunzhenyu
|
df3b8eebd7
|
修改综合演练三维驾驶退出
|
2020-07-09 16:03:33 +08:00 |
|
sunzhenyu
|
93e0b71ab4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:46:19 +08:00 |
|
sunzhenyu
|
27d4c93775
|
修改三维编辑器
|
2020-07-09 15:46:12 +08:00 |
|
joylink_cuiweidong
|
9b3cd2dc3d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:45:47 +08:00 |
|
fan
|
22f94f7ef5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:47:07 +08:00 |
|
fan
|
81be7e776d
|
设备登录调整
|
2020-07-09 15:46:52 +08:00 |
|
joylink_cuiweidong
|
ffab9631ce
|
代码调整
|
2020-07-09 15:45:32 +08:00 |
|
joylink_cuiweidong
|
84485c6f1d
|
剧本编制代码调整
|
2020-07-09 15:44:12 +08:00 |
|
joylink_cuiweidong
|
b7d0f11b9c
|
去掉断点
|
2020-07-09 15:16:12 +08:00 |
|
joylink_cuiweidong
|
15c6a151c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:09:35 +08:00 |
|
joylink_cuiweidong
|
763d04d630
|
剧本编制 切换角色 过滤掉不在线的司机
|
2020-07-09 15:09:18 +08:00 |
|
fan
|
8af4eb6187
|
设备登录调整
|
2020-07-09 15:06:15 +08:00 |
|
fan
|
6aa7fdf1bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 13:06:04 +08:00 |
|
fan
|
404c56e874
|
过滤司机角色调整
|
2020-07-09 13:05:50 +08:00 |
|
fan
|
577cc3c887
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 11:07:33 +08:00 |
|
zyy
|
8a4bbbd682
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 11:07:20 +08:00 |
|
zyy
|
a16f8ebf00
|
配置哈尔滨项目路由
|
2020-07-09 11:07:06 +08:00 |
|
fan
|
e658fb7889
|
哈尔滨项目调整
|
2020-07-09 11:07:04 +08:00 |
|
joylink_cuiweidong
|
9e71ca967f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 10:51:14 +08:00 |
|