Commit Graph

71 Commits

Author SHA1 Message Date
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
joylink_cuiweidong
ba084b23d8 代码调整 2019-12-05 10:19:41 +08:00
zyy
23f93194e6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
2019-12-04 18:40:19 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +08:00
joylink_cuiweidong
585d403e7d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 15:49:33 +08:00
joylink_cuiweidong
c971cf32f8 代码调整 2019-12-04 15:49:24 +08:00
fan
cd18f40939 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 15:33:18 +08:00
fan
f5a5d20ebb 绘图相关调整_(批量创建车站,区段添加激活) 2019-12-04 15:33:08 +08:00
zyy
d5bb00b924 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
2019-12-04 15:00:46 +08:00
zyy
5b6e30f01b 增加按图折返 2019-12-04 14:59:04 +08:00
joylink_cuiweidong
aadc6b1856 代码调整 2019-12-04 14:43:47 +08:00
joylink_cuiweidong
7a9db12402 代码调整 2019-12-04 14:41:08 +08:00
zyy
30bab42bbf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2019-12-04 14:09:29 +08:00
zyy
69e73b2195 修改代码 2019-12-04 14:08:55 +08:00
joylink_cuiweidong
eb9873e6e5 代码调整 2019-12-04 13:38:32 +08:00
joylink_cuiweidong
d94bbff72f 代码调整 2019-12-04 13:00:24 +08:00
joylink_cuiweidong
c818577e48 代码调整 2019-12-03 17:52:39 +08:00
joylink_cuiweidong
967d7ddaad 代码调整 2019-12-03 15:22:16 +08:00
joylink_cuiweidong
9f1167b8fe 车站站台代码调整 2019-12-03 14:56:18 +08:00
joylink_cuiweidong
23f8f8646a 车站代码调整 2019-12-03 13:24:22 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00