joylink_cuiweidong
|
9dc0124da2
|
哈尔滨线路 现地行调切换代码调整
|
2020-03-17 14:28:23 +08:00 |
|
zyy
|
d3b9b718b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 11:29:47 +08:00 |
|
zyy
|
96ed68cf65
|
调整宁波线路现地操作
|
2020-03-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
09e452143d
|
北京一号线 现地 道岔操作代码调整
|
2020-03-17 11:09:09 +08:00 |
|
fan
|
022cf8c6ac
|
代码调整
|
2020-03-17 10:07:02 +08:00 |
|
joylink_cuiweidong
|
81c88dd63c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:55:04 +08:00 |
|
joylink_cuiweidong
|
b088287b6c
|
北京一号线 现地 站台总取消 站台扣车操作代码操作
|
2020-03-17 09:54:49 +08:00 |
|
fan
|
36026fc4ed
|
删除日志
|
2020-03-17 09:29:41 +08:00 |
|
fan
|
1598e77215
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:26:02 +08:00 |
|
fan
|
b06b2b58e2
|
调整现地操作
|
2020-03-17 09:25:40 +08:00 |
|
zyy
|
154b252fd6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 19:08:31 +08:00 |
|
zyy
|
9e150eed8d
|
调整控制权转移请求参数，调整宁波区段显示逻辑
|
2020-03-16 19:08:18 +08:00 |
|
joylink_cuiweidong
|
f437f18f63
|
北京线现地进路建立代码调整
|
2020-03-16 18:53:36 +08:00 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
fan
|
7fce0afd5a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:57:53 +08:00 |
|
joylink_cuiweidong
|
c695309b9f
|
代码修改
|
2020-03-16 17:56:10 +08:00 |
|
fan
|
18f69e3429
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:54:42 +08:00 |
|
fan
|
aa93cfc250
|
调整现地操作
|
2020-03-16 17:54:30 +08:00 |
|
joylink_cuiweidong
|
9bac0200be
|
代码调整
|
2020-03-16 17:46:34 +08:00 |
|
fan
|
9c3a61a747
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:17:18 +08:00 |
|
fan
|
0377ef014b
|
合并代码
|
2020-03-16 17:16:59 +08:00 |
|
joylink_cuiweidong
|
1a8b37f2b4
|
北京一号线 现地 排列进路操作代码调整
|
2020-03-16 16:28:53 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
4ab462ed5d
|
合并代码
|
2020-03-16 15:32:00 +08:00 |
|
fan
|
cd9915668b
|
综合演练接口修改
|
2020-03-16 15:29:26 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
sunzhenyu
|
9ec0c99d70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-16 13:32:27 +08:00 |
|
sunzhenyu
|
896fc027a9
|
修改三维编辑加载
|
2020-03-16 13:32:20 +08:00 |
|
zyy
|
778a7869af
|
调整默认状态
|
2020-03-16 11:04:15 +08:00 |
|
zyy
|
c39ec3301b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 11:02:46 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
joylink_cuiweidong
|
a7193c5424
|
代码调整
|
2020-03-16 10:36:01 +08:00 |
|
fan
|
a29b0360d5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 10:16:29 +08:00 |
|
fan
|
00b1b13542
|
调整哈尔滨显示
|
2020-03-16 10:16:17 +08:00 |
|
fan
|
6a77d68c8d
|
调整哈尔滨显示
|
2020-03-16 10:15:58 +08:00 |
|
joylink_zyy
|
925ff55acf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 21:17:25 +08:00 |
|
joylink_zyy
|
0e570584bc
|
调整ibp绘制地图
|
2020-03-13 21:17:20 +08:00 |
|
joylink_cuiweidong
|
fb9fcc30a3
|
代码调整
|
2020-03-13 20:02:40 +08:00 |
|
joylink_cuiweidong
|
6576f3c559
|
代码调整
|
2020-03-13 19:39:36 +08:00 |
|
zyy
|
5dbd676ccf
|
调整代码
|
2020-03-13 19:04:28 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
fan
|
5cdd38665c
|
Merge remote-tracking branch 'origin/test'
|
2020-03-13 18:28:56 +08:00 |
|
fan
|
47a856e0c1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-13 18:24:11 +08:00 |
|
zyy
|
19f64034fb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/chengdu_01/model.js
# src/utils/baseUrl.js
|
2020-03-13 18:20:02 +08:00 |
|
fan
|
553900df47
|
调整成都三操作
|
2020-03-13 18:19:27 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
fan
|
5733101b2b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 16:35:13 +08:00 |
|
fan
|
a7b81a3383
|
调整车次窗初始显示
|
2020-03-13 16:35:03 +08:00 |
|
joylink_cuiweidong
|
494e1fc815
|
北京一号线 现地 设置进路操作代码调整
|
2020-03-13 15:36:26 +08:00 |
|
fan
|
264310f28e
|
调整成都三显示
|
2020-03-13 15:06:14 +08:00 |
|