joylink_cuiweidong
|
679d714b29
|
道岔绘图代码调整
|
2020-09-03 18:17:15 +08:00 |
|
zyy
|
6883fce3a7
|
调整配置
|
2020-09-03 16:21:19 +08:00 |
|
zyy
|
8c23957881
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 15:44:42 +08:00 |
|
zyy
|
2af510b991
|
调整目的码流程
|
2020-09-03 15:44:30 +08:00 |
|
fan
|
890fc5f851
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 14:44:28 +08:00 |
|
fan
|
5f0b8a05ac
|
运行图流程调整
|
2020-09-03 14:44:16 +08:00 |
|
zyy
|
ab538b9bb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
|
2020-09-03 14:22:44 +08:00 |
|
zyy
|
31eb1f8446
|
调整目的码接口
|
2020-09-03 14:17:52 +08:00 |
|
joylink_cuiweidong
|
9a2e007d3f
|
福州一号线新版 扣车样式调整 站台操作调整
|
2020-09-03 11:14:51 +08:00 |
|
joylink_cuiweidong
|
7044642105
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 18:41:09 +08:00 |
|
joylink_cuiweidong
|
2ed40ee117
|
宁波一号线实训操作代码调整
|
2020-09-02 18:40:51 +08:00 |
|
fan
|
d40491fb41
|
merge
|
2020-09-02 18:06:48 +08:00 |
|
fan
|
3445f98618
|
宁波三号线菜单调整
|
2020-09-02 18:02:50 +08:00 |
|
joylink_cuiweidong
|
1427b42d25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 18:00:08 +08:00 |
|
joylink_cuiweidong
|
6680ea03cf
|
道岔绘图调整（除了哈尔滨线路外，其余线路反位不显示岔芯 直角梯形D）
|
2020-09-02 17:59:50 +08:00 |
|
zyy
|
69388e4f91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 17:11:23 +08:00 |
|
zyy
|
efcd46cf37
|
增加宁波三区段样式，增加目的码表单
|
2020-09-02 17:11:06 +08:00 |
|
joylink_cuiweidong
|
647897b2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 14:33:58 +08:00 |
|
joylink_cuiweidong
|
2010edad72
|
宁波一号线站台设置停站时间操作代码调整
|
2020-09-02 14:33:41 +08:00 |
|
fan
|
910517e076
|
剧本调整
|
2020-09-02 10:59:04 +08:00 |
|
fan
|
5f04b0e25b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 10:18:28 +08:00 |
|
fan
|
c9bab84c50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 10:18:06 +08:00 |
|
fan
|
dda0a719ba
|
宁波三菜单调整
|
2020-09-02 10:17:58 +08:00 |
|
joylink_cuiweidong
|
61d9f294d8
|
哈尔滨线路代码调整
|
2020-09-02 10:15:50 +08:00 |
|
joylink_cuiweidong
|
4789fa23de
|
代码调整
|
2020-09-02 09:48:30 +08:00 |
|
joylink_cuiweidong
|
4c6ab4f046
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 09:46:46 +08:00 |
|
joylink_cuiweidong
|
935588ab32
|
剧本预览代码调整
|
2020-09-02 09:46:17 +08:00 |
|
fan
|
0d026649f3
|
删除日志
|
2020-09-02 09:23:27 +08:00 |
|
fan
|
86c1dff4be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 09:17:50 +08:00 |
|
fan
|
ecbb6a964f
|
接收重置仿真信息时清除活动列车
|
2020-09-02 09:17:27 +08:00 |
|
joylink_cuiweidong
|
b42ffaa00f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 18:27:56 +08:00 |
|
joylink_cuiweidong
|
de8263e062
|
剧本编制代码优化调整
|
2020-09-01 18:27:36 +08:00 |
|
zyy
|
c93cff772d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 18:09:38 +08:00 |
|
zyy
|
a3489f0942
|
调整区段显示及优化
|
2020-09-01 18:09:25 +08:00 |
|
fan
|
15039440b7
|
运行图预览初始化动态数据和选中数据
|
2020-09-01 17:20:59 +08:00 |
|
fan
|
a5cbbcb3af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 17:11:24 +08:00 |
|
fan
|
fcd2c41517
|
成员司机排序&福州新版折返策略教学调整
|
2020-09-01 17:11:09 +08:00 |
|
joylink_cuiweidong
|
bcc92b6672
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 16:45:39 +08:00 |
|
joylink_cuiweidong
|
8a4d98612e
|
哈尔滨线路实训代码调整
|
2020-09-01 16:45:23 +08:00 |
|
sunzhenyu
|
55ea7ec549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 15:22:25 +08:00 |
|
sunzhenyu
|
e57a70df9e
|
修改三维vr道岔模型动画导航bug
|
2020-09-01 15:22:19 +08:00 |
|
zyy
|
57cb96eb48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/mapsystemNew/common/index.vue
|
2020-09-01 15:11:59 +08:00 |
|
zyy
|
5590e43bd5
|
调整代码
|
2020-09-01 15:10:35 +08:00 |
|
sunzhenyu
|
b87220ec8c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 13:18:20 +08:00 |
|
sunzhenyu
|
7e7a76ae6a
|
修改三维通号订阅关闭
|
2020-09-01 13:18:12 +08:00 |
|
fan
|
73224c25c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 11:22:08 +08:00 |
|
fan
|
13764f98a7
|
修改会话问题
(cherry picked from commit 716e7c2117)
|
2020-09-01 11:22:01 +08:00 |
|
sunzhenyu
|
5e39f3e2fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 11:17:36 +08:00 |
|
sunzhenyu
|
4a1e3d0aa7
|
修改三维电子沙盘内外侧站台数据不全bug，修改外车站台漫游
|
2020-09-01 11:17:29 +08:00 |
|
fan
|
46e6ec68d5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 18:32:56 +08:00 |
|