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 |
|
zyy
|
40687fcd5b
|
调整信号机批量设置偏移量
|
2020-12-14 17:06:23 +08:00 |
|
fan
|
fd7418e4a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:00:29 +08:00 |
|
fan
|
aceee45c47
|
提示调整
|
2020-12-14 17:00:15 +08:00 |
|
joylink_cuiweidong
|
1deaf4defc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 16:54:31 +08:00 |
|
joylink_cuiweidong
|
89b635e24a
|
地图绘制代码调整
|
2020-12-14 16:53:43 +08:00 |
|
fan
|
8dc4e2572b
|
创建项目权限包
|
2020-12-14 16:28:55 +08:00 |
|
fan
|
0364fa0f2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 15:51:29 +08:00 |
|
fan
|
383287fe56
|
新窗口ibp展示添加退出按钮
|
2020-12-14 15:51:14 +08:00 |
|
fan
|
62cba757e6
|
绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整
|
2020-12-14 15:22:47 +08:00 |
|
sunzhenyu
|
2d0c0c475b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 14:43:51 +08:00 |
|
sunzhenyu
|
83a01ddf8c
|
增加三维沙盘和驾驶中停站倒计时TDT
|
2020-12-14 14:43:43 +08:00 |
|
zyy
|
02a6293d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 11:29:43 +08:00 |
|
zyy
|
0310ee6c57
|
调整地图流程
|
2020-12-14 11:29:26 +08:00 |
|
joylink_cuiweidong
|
5262f4697b
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 21:42:40 +08:00 |
|
fan
|
ef8cedb389
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 21:41:15 +08:00 |
|
fan
|
be20a39021
|
项目登录调整
|
2020-12-11 21:40:52 +08:00 |
|
joylink_cuiweidong
|
f048151496
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 21:21:47 +08:00 |
|
joylink_cuiweidong
|
1fe7518ddf
|
代码调整
|
2020-12-11 21:20:54 +08:00 |
|
joylink_cuiweidong
|
c3fc4a1797
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 20:18:58 +08:00 |
|
joylink_cuiweidong
|
328805ba80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 20:17:41 +08:00 |
|
joylink_cuiweidong
|
d8c6a8657b
|
哈尔滨运行图编制代码调整
|
2020-12-11 20:17:18 +08:00 |
|
fan
|
a410832030
|
哈尔滨屏蔽门调整
|
2020-12-11 20:16:56 +08:00 |
|