fan
|
8ea94587ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 09:09:14 +08:00 |
|
fan
|
5e791b4314
|
loading动图调整
|
2020-09-07 09:09:04 +08:00 |
|
fan
|
f33a793435
|
路由跳转loading
|
2020-09-07 09:06:28 +08:00 |
|
fan
|
269cfa0acd
|
Merge remote-tracking branch 'origin/test'
|
2020-09-04 18:26:07 +08:00 |
|
fan
|
696cbbe439
|
Merge remote-tracking branch 'origin/test'
|
2020-09-04 18:25:30 +08:00 |
|
joylink_cuiweidong
|
3b8c4852c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 18:22:59 +08:00 |
|
joylink_cuiweidong
|
0d6ed19f4a
|
道岔绘图代码调整
|
2020-09-04 18:22:41 +08:00 |
|
fan
|
b47b63305a
|
运行图预览调整
|
2020-09-04 18:04:32 +08:00 |
|
fan
|
5af9956f5b
|
佛山修改列车识别好调整
|
2020-09-04 17:57:37 +08:00 |
|
fan
|
dc085df977
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 17:21:46 +08:00 |
|
fan
|
f33fb7ee91
|
绘图数据处理调整&佛山修改列车识别好调整
|
2020-09-04 17:21:34 +08:00 |
|
zyy
|
7db89b8351
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 10:44:28 +08:00 |
|
zyy
|
2b548186c3
|
调整道岔绘制流程
|
2020-09-04 10:44:17 +08:00 |
|
joylink_cuiweidong
|
7df77d2639
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 10:38:54 +08:00 |
|
joylink_cuiweidong
|
d328a11569
|
西安三号线 福州一号线新版 地图配置文件调整
|
2020-09-04 10:38:36 +08:00 |
|
zyy
|
a8bcc13e4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 09:24:47 +08:00 |
|
zyy
|
11d3c6d129
|
调整必须字段
|
2020-09-04 09:24:34 +08:00 |
|
joylink_cuiweidong
|
b6c39918e0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 18:17:40 +08:00 |
|
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
|
92f4635a51
|
Merge remote-tracking branch 'origin/test'
|
2020-09-02 11:00:01 +08:00 |
|
fan
|
910517e076
|
剧本调整
|
2020-09-02 10:59:04 +08:00 |
|
fan
|
1af1b7a609
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2020-09-02 10:19:50 +08:00 |
|
fan
|
529dce5d2c
|
Merge remote-tracking branch 'origin/test'
|
2020-09-02 10:19:25 +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 |
|