Commit Graph

2935 Commits

Author SHA1 Message Date
fan
4f2fc22ee8 绘图相关调整_(撤销恢复快捷键调整) 2019-12-06 09:13:56 +08:00
fan
75f400a1c7 绘图相关调整_(添加快捷删除) 2019-12-05 18:53:06 +08:00
fan
a4324e6711 绘图相关调整_(高亮删除虚线描边) 2019-12-05 18:01:31 +08:00
fan
ea76deeb93 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:39:55 +08:00
fan
1d07789b4f 绘图相关调整_(区段问题调整) 2019-12-05 16:39:44 +08:00
zyy
f5ae986443 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:18:02 +08:00
zyy
b66aecff7e 调整区段名字生成规则 2019-12-05 16:17:54 +08:00
joylink_cuiweidong
902e92de1f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
2019-12-05 15:52:29 +08:00
joylink_cuiweidong
2805a4219c 区段代码调整 2019-12-05 15:48:01 +08:00
fan
22f9332ea3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 14:55:33 +08:00
fan
a83b2cd2cd 绘图相关调整_(问题调整) 2019-12-05 14:54:33 +08:00
joylink_cuiweidong
09590e7657 删除stationControl 2019-12-05 10:52:45 +08:00
zyy
0a51aa1e23 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Station/index.js
#	src/views/newMap/newMapdraft/mapoperate/station.vue
2019-12-05 10:27:06 +08:00
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
joylink_cuiweidong
ba084b23d8 代码调整 2019-12-05 10:19:41 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +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
7e9728a276 代码调整 2019-12-04 14:07:37 +08:00
fan
1ec864986a 绘图相关调整_(设备添加高亮) 2019-12-04 14:02:39 +08:00
fan
a5e4861895 绘图相关调整_(设备添加高亮) 2019-12-04 11:32:30 +08:00
fan
4ef0c259c5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 09:34:05 +08:00
fan
87e2a11011 绘图相关调整_(区段添加高亮) 2019-12-04 09:33:45 +08:00
zyy
4526204f03 修改显示层级 2019-12-03 18:44:46 +08:00
zyy
c089ce1187 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 14:42:07 +08:00
zyy
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
fan
676d93d1bd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 13:36:30 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
joylink_cuiweidong
23f8f8646a 车站代码调整 2019-12-03 13:24:22 +08:00
fan
39edfbe760 调整绘图相关配置 2019-12-03 09:26:55 +08:00
fan
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
joylink_cuiweidong
cee4a7a396 代码调整 2019-12-02 16:19:40 +08:00
joylink_cuiweidong
40cb954be4 控制模式代码调整 2019-12-02 15:25:26 +08:00
fan
a3936c0e5b 调整绘图相关 2019-12-02 13:01:26 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00