Commit Graph

77 Commits

Author SHA1 Message Date
joylink_cuiweidong
882bb44fb2 根据设备code高亮 地图对应的设备 2019-12-19 15:52:36 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
35688adcd0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:03:18 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
fan
d09b418bba 绘图相关调整_(添加快捷键修改) 2019-12-06 15:12:22 +08:00
fan
7cc2b68d13 绘图相关调整_(区段快捷删除调整) 2019-12-06 14:36:18 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
joylink_cuiweidong
6f31e57e64 代码调整 2019-12-05 14:31:39 +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
fan
60b4d6a060 绘图相关调整_(高亮问题调整) 2019-12-04 18:40:45 +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
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
fan
98248904e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 14:02:59 +08:00
fan
1ec864986a 绘图相关调整_(设备添加高亮) 2019-12-04 14:02:39 +08:00
joylink_cuiweidong
eb9873e6e5 代码调整 2019-12-04 13:38:32 +08:00
joylink_cuiweidong
f97bd74c39 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 13:01:22 +08:00
joylink_cuiweidong
d94bbff72f 代码调整 2019-12-04 13:00:24 +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
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
joylink_cuiweidong
46713bf074 删除页面link设置 2019-11-29 13:27:17 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00