joylink_cuiweidong
|
2affbbd5e4
|
地图绘制代码调整
|
2020-07-24 17:51:55 +08:00 |
|
zyy
|
8b5122a88f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:17:52 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
joylink_cuiweidong
|
f8f921a543
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 16:03:29 +08:00 |
|
joylink_cuiweidong
|
d5ad3ab59d
|
地图绘制代码调整
|
2020-07-24 16:02:55 +08:00 |
|
fan
|
8a660e75f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:29:01 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|
joylink_cuiweidong
|
f06a025792
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:24:45 +08:00 |
|
joylink_cuiweidong
|
d5215a3c1c
|
哈尔滨线路 停站时间状态绘图调整
|
2020-07-24 15:23:55 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
zyy
|
b69cc2c4ab
|
调整哈尔滨线路设备管理，判断设备管理显示逻辑
|
2020-07-24 14:11:03 +08:00 |
|
zyy
|
584f65d285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 11:01:33 +08:00 |
|
zyy
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +08:00 |
|
joylink_cuiweidong
|
ed8795a3a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 10:35:22 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
fan
|
33a8eba1c7
|
调整实训行为记录
|
2020-07-24 10:14:59 +08:00 |
|
fan
|
5d413dba8c
|
调整订阅
|
2020-07-23 19:25:40 +08:00 |
|
zyy
|
e7ee0344b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 18:07:46 +08:00 |
|
zyy
|
fb0f961b17
|
删除多余线路逻辑
|
2020-07-23 18:04:13 +08:00 |
|
joylink_cuiweidong
|
a2fdb7a571
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:57:49 +08:00 |
|
fan
|
14d787ea9c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:57:43 +08:00 |
|
joylink_cuiweidong
|
5a35fa4f29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 17:57:36 +08:00 |
|
fan
|
a9233a082e
|
代码调整
|
2020-07-23 17:57:35 +08:00 |
|
joylink_cuiweidong
|
986ce16d78
|
仿真系统聊天代码调整
|
2020-07-23 17:51:37 +08:00 |
|
sunzhenyu
|
acbb0c4e79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:30:09 +08:00 |
|
sunzhenyu
|
6ea27abcc9
|
修改三维单体设备初始化
|
2020-07-23 17:29:53 +08:00 |
|
zyy
|
2434de38bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:09:43 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
fan
|
fdf49e53ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:55:40 +08:00 |
|
fan
|
91faa164ea
|
删除断点
|
2020-07-23 16:55:23 +08:00 |
|
joylink_cuiweidong
|
81bfb35e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:43:01 +08:00 |
|
joylink_cuiweidong
|
6210df54de
|
代码调整
|
2020-07-23 16:42:39 +08:00 |
|
sunzhenyu
|
5282d6f029
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:37:26 +08:00 |
|
sunzhenyu
|
8f0a4ec631
|
三维单体设备屏蔽门到站提醒声音(windows语音合成)
|
2020-07-23 16:37:14 +08:00 |
|
fan
|
9d7c11dca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:07:44 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
joylink_cuiweidong
|
d8484da992
|
运行图选中计划线 线条加粗 调整
|
2020-07-23 14:46:26 +08:00 |
|
joylink_cuiweidong
|
72b137435c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 13:38:59 +08:00 |
|
joylink_cuiweidong
|
478a8f0ba4
|
宁波线的列车，RM模式的时候，前面的箭头设置为灰色
|
2020-07-23 13:38:31 +08:00 |
|
zyy
|
11c021feb8
|
调整屏蔽门绘图
|
2020-07-23 13:16:45 +08:00 |
|
zyy
|
d313348a41
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 10:33:12 +08:00 |
|
zyy
|
e9b8e6e1b9
|
调整哈尔滨线路屏蔽门样式
|
2020-07-23 10:32:58 +08:00 |
|
joylink_cuiweidong
|
ece0ac79a3
|
剧本预览代码调整
|
2020-07-23 10:29:53 +08:00 |
|
joylink_cuiweidong
|
a85a543a39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 17:20:47 +08:00 |
|
joylink_cuiweidong
|
597822430e
|
剧本预览代码调整
|
2020-07-22 17:20:24 +08:00 |
|
fan
|
0a5999bcd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:59:11 +08:00 |
|
fan
|
7a783cf032
|
项目设备大屏调整
|
2020-07-22 14:59:00 +08:00 |
|
sunzhenyu
|
4dfc104d4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:35:10 +08:00 |
|
sunzhenyu
|
714b520c38
|
修改三维设备展示站台名适配
|
2020-07-22 14:35:01 +08:00 |
|