From e2bf4ab5fbcc29209d74101d99c0690d4ffbe234 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 17:14:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index feb70b0..623cfca 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -95,12 +95,13 @@
methods: {
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
+ // window.mapManager.clickDialogSwitch = false
window.map.on('click', this.selectClick)
- // 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
+ // window.mapManager.clickDialogSwitch = true
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
+ // console.log(e)
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
@@ -114,7 +115,7 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- // console.log(res)
+ console.log(res)
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
} else {
@@ -123,7 +124,6 @@
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
@@ -214,7 +214,11 @@
const geom = JSON.parse(itm.geomText)
const points = []
geom.coordinates.forEach((it, id) => {
- points.push(it.reverse())
+ const item = it.reverse()
+ if (it.length > 2) {
+ item.shift()
+ }
+ points.push(item)
})
linkPipe.push(points)
})
--
Gitblit v1.8.0