joylink_cuiweidong
|
98603f09a8
|
代码调整
|
2020-12-16 18:22:37 +08:00 |
|
zyy
|
3ec50678c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:22:38 +08:00 |
|
zyy
|
24b95e3811
|
调整成都一报错
|
2020-12-16 16:22:24 +08:00 |
|
fan
|
68a0eadf9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:05:55 +08:00 |
|
fan
|
7eec38fe65
|
车次窗前端状态重建后保留
|
2020-12-16 16:05:33 +08:00 |
|
zyy
|
34bff76eb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 15:37:22 +08:00 |
|
zyy
|
c2f6c3461b
|
调整宁波三,增加字段
|
2020-12-16 15:37:09 +08:00 |
|
joylink_cuiweidong
|
90f0b4e918
|
运行图编制代码调整
|
2020-12-16 14:51:59 +08:00 |
|
fan
|
3aadd5d682
|
Merge remote-tracking branch 'origin/test'
|
2020-12-16 14:00:49 +08:00 |
|
fan
|
b604fdbe43
|
暂提
|
2020-12-16 13:59:31 +08:00 |
|
sunzhenyu
|
d08be87108
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:54:26 +08:00 |
|
sunzhenyu
|
4dfe892f18
|
修改三维客流初始化仿真重置数据
|
2020-12-16 13:54:08 +08:00 |
|
fan
|
c9dbe2701c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:26:17 +08:00 |
|
fan
|
bd0aac34fe
|
综合演练现地显示调整
|
2020-12-16 13:25:55 +08:00 |
|
joylink_cuiweidong
|
4eb8d4e5be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 11:15:29 +08:00 |
|
joylink_cuiweidong
|
5a5193cde5
|
北交大客流 运行图代码调整
|
2020-12-16 11:14:35 +08:00 |
|
fan
|
d5b0508467
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 10:55:25 +08:00 |
|
fan
|
eebb034208
|
现地增加ibp& 现地切换值班员角色调整
|
2020-12-16 10:54:55 +08:00 |
|
joylink_cuiweidong
|
1715dcad32
|
北交大 客流数据代码调整
|
2020-12-16 10:18:58 +08:00 |
|
joylink_cuiweidong
|
525fc25469
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 09:42:15 +08:00 |
|
joylink_cuiweidong
|
0a5eb83904
|
代码调整
|
2020-12-16 09:41:53 +08:00 |
|
joylink_cuiweidong
|
3f7d5da3b1
|
代码调整
|
2020-12-16 09:40:37 +08:00 |
|
fan
|
1faa02cffa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:16:04 +08:00 |
|
fan
|
19e9cb7948
|
缓存运行图数据
|
2020-12-15 18:15:48 +08:00 |
|
joylink_cuiweidong
|
ce363e9528
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:10:37 +08:00 |
|
joylink_cuiweidong
|
1453d5538a
|
北交大客流仿真代码调整
|
2020-12-15 18:09:10 +08:00 |
|
zyy
|
74f67768ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 17:00:07 +08:00 |
|
zyy
|
0c936bb0ce
|
调整宁波三控制权操作
|
2020-12-15 16:59:51 +08:00 |
|
joylink_cuiweidong
|
845b620e65
|
北交大仿真 切换客流数据调整
|
2020-12-15 16:20:11 +08:00 |
|
zyy
|
9e48ca39a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 14:41:36 +08:00 |
|
zyy
|
249bef4802
|
调整道岔生成逻辑
|
2020-12-15 14:41:23 +08:00 |
|
joylink_cuiweidong
|
a45374acc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 13:36:05 +08:00 |
|
joylink_cuiweidong
|
da59fdbed6
|
代码调整
|
2020-12-15 13:35:38 +08:00 |
|
fan
|
3c6047d4ad
|
打包调整
|
2020-12-15 11:18:15 +08:00 |
|
zyy
|
7ec4a2db59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 11:10:19 +08:00 |
|
zyy
|
b85dcb41dc
|
调整道岔生成逻辑
|
2020-12-15 11:10:05 +08:00 |
|
sunzhenyu
|
fb8c985113
|
剔除无用三维客流代码
|
2020-12-15 11:00:15 +08:00 |
|
sunzhenyu
|
e9ca305560
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 10:58:49 +08:00 |
|
sunzhenyu
|
5dfded5bf1
|
修复三维客流车站先下后上,修复上行站台下车不均匀分布bug
|
2020-12-15 10:58:41 +08:00 |
|
fan
|
dff745b94a
|
南铁院本地打包
|
2020-12-15 09:54:54 +08:00 |
|
fan
|
76e487b774
|
南铁院本地打包
|
2020-12-14 19:43:40 +08:00 |
|
fan
|
91197718c8
|
Merge branch 'test'
|
2020-12-14 18:41:55 +08:00 |
|
fan
|
3455d2fe86
|
南铁院本地打包
|
2020-12-14 18:18:24 +08:00 |
|
fan
|
3c8fa57b09
|
南铁院本地打包
|
2020-12-14 18:10:37 +08:00 |
|
fan
|
081bebf16d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:55:08 +08:00 |
|
fan
|
8ab05255ab
|
南铁院本地调整
|
2020-12-14 17:54:45 +08:00 |
|
joylink_cuiweidong
|
c437ac62c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:19:31 +08:00 |
|
joylink_cuiweidong
|
0ecea0aabc
|
地图绘制代码调整
|
2020-12-14 17:18:57 +08:00 |
|
fan
|
44fb0805bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:13:06 +08:00 |
|
zyy
|
e5a51e0d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-12-14 17:07:15 +08:00 |
|