From 4fef038c7e4ba6a82b77e9679f58e2f9d8c0711b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 126 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 33 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 3894691..9a8d1f0 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -354,15 +354,17 @@
<span>绠＄嚎鏌ヨ缁撴灉</span>
</div>
<el-table
+ class="dddddd"
:data="tableData"
+ max-height="200"
style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column
- prop="name"
+ prop="pipename"
label="绠＄嚎鍚嶇О"
width="180">
</el-table-column>
<el-table-column
- prop="type"
+ prop="mediumtype"
label="绠＄嚎绫诲瀷"
width="180">
</el-table-column>
@@ -465,6 +467,7 @@
this.clearLX()
this.linkClear()
this.jdmClear()
+ this.currentLinkIsTrue = ''
this.bgFm = []
this.bgPipeLine = []
this.tableData = []
@@ -503,7 +506,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 +516,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 +598,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 +642,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 +709,7 @@
// 鏁版嵁璇锋眰鍙傛暟
const param = {
- lineID: e.id
+ lineID: e.pipesegcode
}
const res = await mapApi.findLeakages(param)
console.log(res)
@@ -698,6 +721,7 @@
}
res.data.reverse()
this.bgFm = res.data
+ console.log(res.data)
this.bgPoint = res.data[0].startControlPoint
@@ -705,10 +729,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 +741,6 @@
geom.coordinates.forEach((it, id) => {
points.push(it.reverse())
})
-
linkPipe.push(points)
})
@@ -762,17 +785,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 +816,10 @@
this.linkPipeline.push(line)
})
},
+ // 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀� 鐨勬暟鎹鐞嗘柟娉�
+ // getres (res) {
+ //
+ // },
// 娓呴櫎娴佸悜
clearLX () {
if (this.flowPipeLine != null) {
@@ -882,10 +905,21 @@
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
console.log(res)
+ const dataPoint = res.data.point
+ console.log(dataPoint)
+ // this.tableData = dataPoint.pipelines.extraData
+ for (let i = 0; i < dataPoint.length; i++) {
+ const obj = {
+ pipename: dataPoint[i].pipelines.extraData.pipename,
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype
+ }
+ this.tableData.push(obj)
+ }
},
// 妯柇闈㈢粯鍒跺畬鎴愬悗 杩涜妯柇闈㈡暟鎹垎鏋� 杩涜鍥捐〃灞曠ず
async selectRow (e) {
console.log(e)
+ // const dataSeries = e.data.pointInterval
// 3. 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁锛屾樉绀哄浘琛�
const option = {
xAxis: {
@@ -897,10 +931,11 @@
},
series: [{
data: [820, 932, 901, 934, 1290, 1330, 1320],
+ // data: dataSeries,
type: 'line'
}]
}
- // this.myChartShow = true
+ this.myChartShow = true
this.myChart.setOption(option)
},
// 妯柇闈㈡竻闄�
@@ -915,6 +950,31 @@
</script>
<style lang="less" scoped>
+/*****婊氬姩鏉�***/
+.dddddd{
+ .el-table__fixed-right-patch{
+ display: none;
+ }
+}
+.dddddd::-webkit-scrollbar {
+ /*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 10px;
+}
+
+.dddddd::-webkit-scrollbar-thumb {
+ /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ background: #000;
+}
+
+.dddddd::-webkit-scrollbar-track {
+ /*婊氬姩鏉￠噷闈㈣建閬�*/
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: @background-color;
+ border-radius: 10px;
+}
+
///deep/ .el-table__row:hover > td {
// background: none !important;
//}
--
Gitblit v1.8.0