From dc1884bc0afc8c4547a056c7ff0b9e78467b5dfc Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 17:54:30 +0800
Subject: [PATCH] 管线分析
---
src/components/LayerController/service/WfsLayerService.js | 6 ++
src/conf/MapConfig.js | 8 ++--
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 83 ++++++++++++++++++++++++++---------------
src/api/mapUrl.js | 2 -
4 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index b9cb528..98b9986 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -30,10 +30,8 @@
export const getCompany = $HOST + '/company/getCompany'
// 绠＄嚎鍒嗘瀽
-// export const findPipelineByClickPoint = $HOST + '/findPipelineByClickPoint'
export const findPipelineByClickPoint = 'http://xearth.cn:6202' + '/findPipelineByClickPoint'
export const findConnectedPipelines = 'http://xearth.cn:6202' + '/findConnectedPipelines'
-// export const findConnectedPipelines = $HOST + '/findConnectedPipelines'
export const findFlowDirection = 'http://xearth.cn:6202' + '/findFlowDirection'
export const findLeakages = 'http://xearth.cn:6202' + '/findLeakages'
export const getCrossSection = 'http://xearth.cn:6202' + '/getCrossSection'
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index 606d84a..5bc5a9f 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -73,7 +73,11 @@
closeButton: false,
autoClose: false
})
- .bindTooltip((layer) => this.tooltipListener(layer), { direction: 'bottom', offset: [0, 15], sticky: true })
+ layer.bindTooltip((layer) => this.tooltipListener(layer), {
+ direction: 'bottom',
+ offset: [0, 15],
+ sticky: true
+ })
.on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
}
}).addTo(this.layer)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 3894691..74a5ea2 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -465,6 +465,7 @@
this.clearLX()
this.linkClear()
this.jdmClear()
+ this.currentLinkIsTrue = ''
this.bgFm = []
this.bgPipeLine = []
this.tableData = []
@@ -503,7 +504,9 @@
this.bgPipeLine = res.data
} else if (this.activeName === 'third') {
this.tableDataLiuxiang = res.data
- } else if (this.activeName === 'fourth') {}
+ } else if (this.activeName === 'fourth') {
+ }
+ // debugger
console.log(res.data)
},
// 娴佸悜鏄剧ず 鐨勬柟娉曞弬鏁板皝
@@ -511,6 +514,22 @@
const flowLine = window.L.polyline(param.points, param.option)
flowLine.addTo(window.map)
return flowLine
+ },
+ createFlowMarker (point) {
+ return window.L.marker(point, {
+ icon: window.L.divIcon({
+ className: 'dIcon',
+ html: '<div class="plane live">' +
+ // '<img src="'+require("../../assets/images/map/ship.png")+
+ '<div style="position: absolute;' +
+ ' width: 20px;' +
+ ' height: 20px;' +
+ ' border-radius: 50%;' +
+ ' content: \'\'; background-color: #FF664A;"/>' +
+ '<span></span><span></span></div></>',
+ iconSize: [90, 36]
+ })
+ })
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
@@ -577,11 +596,13 @@
this.$message('璇烽�夋嫨璧峰绠℃鍜岀粨鏉熺娈�')
return false
}
+
// 璇锋眰鏁版嵁鏃剁殑鍙傛暟
const param = {
- startLineID: this.currentSelectStart.id,
- endLineID: this.currentSelectEnd.id
+ startLineID: this.currentSelectStart.pipesegcode,
+ endLineID: this.currentSelectEnd.pipesegcode
}
+ console.log(param)
// 璇锋眰鎺ュ彛鍜屾暟鎹�
const res = await mapApi.findConnectedPipelines(param)
console.log(res)
@@ -619,23 +640,23 @@
},
// 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢
linkResultSelect (e) {
- // console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
- // console.log(e)
+ console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
+ console.log(e)
- // const geom = JSON.parse(e.geomText)
- // if (this.currentSelectResultLine != null) {
- // this.currentSelectResultLine.remove()
- // this.currentSelectResultLine = null
- // }
- // this.currentSelectResultLine = L.geoJSON(geom, {
- // style: function (feature) {
- // return {
- // color: 'rgba(255,0,0,.6)',
- // weight: 6
- // }
- // }
- // }).addTo(this.map)
- // this.map.panInsideBounds(this.currentSelectResultLine.getBounds())
+ const geom = JSON.parse(e.geomText)
+ if (this.currentSelectResultLine != null) {
+ this.currentSelectResultLine.remove()
+ this.currentSelectResultLine = null
+ }
+ this.currentSelectResultLine = window.L.geoJSON(geom, {
+ style: function (feature) {
+ return {
+ color: 'rgba(255,0,0,.6)',
+ weight: 6
+ }
+ }
+ }).addTo(this.map)
+ this.map.panInsideBounds(this.currentSelectResultLine.getBounds())
},
// 杩為�氭�х殑娓呴櫎鍔熻兘
linkClear () {
@@ -686,7 +707,7 @@
// 鏁版嵁璇锋眰鍙傛暟
const param = {
- lineID: e.id
+ lineID: e.pipesegcode
}
const res = await mapApi.findLeakages(param)
console.log(res)
@@ -698,6 +719,7 @@
}
res.data.reverse()
this.bgFm = res.data
+ console.log(res.data)
this.bgPoint = res.data[0].startControlPoint
@@ -705,10 +727,10 @@
const p = [point.coordinates[1], point.coordinates[0]]
- // this.bgMarker = main.createFlowMarker(p)
+ this.bgMarker = this.createFlowMarker(p)
this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
- this.bgMarker.addTo(this.map)
- this.map.flyTo(p)
+ this.bgMarker.addTo(window.map)
+ window.map.flyTo(p)
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -717,7 +739,6 @@
geom.coordinates.forEach((it, id) => {
points.push(it.reverse())
})
-
linkPipe.push(points)
})
@@ -762,17 +783,13 @@
},
// 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀�
async lxQuery (e) {
- // console.log(e)
+ console.log(e)
this.clearLinkPipe()
const param = {
// lineNodeID: e.startpoint
- lineNodeID: e.gid
+ lineNodeID: e.startpointnumber
}
const res = await mapApi.findFlowDirection(param)
- this.getres(res)
- },
- // 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀� 鐨勬暟鎹鐞嗘柟娉�
- getres (res) {
this.lxTableDataResult = res.data
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -797,6 +814,10 @@
this.linkPipeline.push(line)
})
},
+ // 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀� 鐨勬暟鎹鐞嗘柟娉�
+ // getres (res) {
+ //
+ // },
// 娓呴櫎娴佸悜
clearLX () {
if (this.flowPipeLine != null) {
@@ -900,7 +921,7 @@
type: 'line'
}]
}
- // this.myChartShow = true
+ this.myChartShow = true
this.myChart.setOption(option)
},
// 妯柇闈㈡竻闄�
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 2343ab8..0acc40f 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -22,10 +22,10 @@
minZoom: 3,
maxZoom: 17,
// center: [26, 104],
- center: [34.828558921813965, 117.41676807403564],
- zoom: 5,
- // center: [32.25853085517883, 118.78592848777771],
- // zoom: 15,
+ // center: [34.828558921813965, 117.41676807403564],
+ // zoom: 5,
+ center: [32.25853085517883, 118.78592848777771],
+ zoom: 15,
worldCopyJump: true,
inertia: true,
zoomControl: false,
--
Gitblit v1.8.0