From 963dbc402ac093f39c4a82036561ba16710f0fed Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期六, 08 五月 2021 17:30:17 +0800
Subject: [PATCH] 管线分析
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 133 +++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index c2c2e5e..00899c8 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -5,20 +5,20 @@
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="杩為�氭��" name="first">
<el-button type="primary" @click="linkClickStart" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠＄嚎">璧峰绠＄嚎
+ title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃
</el-button>
<el-button type="primary" @click="linkClickEnd" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑讳笌鎵�閫夌绾胯繛閫氱绾�">缁撴潫绠＄嚎
+ title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃
</el-button>
<el-button type="primary" @click="linkQuery" size="mini" style="margin-bottom: 5px;"
- title="鏍规嵁璧峰銆佺粨鏉熺绾胯繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�
+ title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�
</el-button>
<el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;"
- title="鏍规嵁璧峰銆佺粨鏉熺绾胯繘琛岃繛閫氭�у垎鏋�">娓呴櫎
+ title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎
</el-button>
<!-- <el-scrollbar style="height:450px">-->
<!-- <el-card shadow="hover">-->
- <span class="fixed-style">璧峰绠＄嚎</span>
+ <span class="fixed-style">璧峰绠℃</span>
<el-table
class="tableBox"
height="100"
@@ -29,7 +29,7 @@
style="width: 100%" size="mini">
<el-table-column
prop="datasource"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -37,7 +37,7 @@
sortable
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -64,7 +64,7 @@
</template>
</el-table-column>
</el-table>
- <span class="fixed-style">缁撴潫绠＄嚎</span>
+ <span class="fixed-style">缁撴潫绠℃</span>
<el-table
class="tableBox"
height="100"
@@ -75,7 +75,7 @@
style="width: 100%" size="mini">
<el-table-column
prop="datasource"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -83,7 +83,7 @@
sortable
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -121,7 +121,7 @@
<el-table-column
prop="material"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -129,7 +129,7 @@
sortable
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -164,15 +164,15 @@
<el-row>
<span>鐖嗙锛堢浉鍏冲紑鍏筹級</span>
<el-button type="primary" @click="bgClick" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭绾�">
- 閫夋嫨绠＄嚎
+ title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">
+ 閫夋嫨绠℃
</el-button>
<el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;" title="娓呴櫎缁樺埗">
娓呴櫎
</el-button>
</el-row>
<!-- <el-card shadow="hover">-->
- <span class="fixed-style">鍙戠敓鐖嗚鐨勭绾�</span>
+ <span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
<el-table
max-height="200"
class="tableBox"
@@ -183,7 +183,7 @@
<el-table-column
:show-overflow-tooltip="true"
prop="pipecode"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -191,7 +191,7 @@
sortable
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -231,7 +231,7 @@
<el-table-column
:show-overflow-tooltip="true"
prop="pipecode"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -239,7 +239,7 @@
:show-overflow-tooltip="true"
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -273,8 +273,8 @@
</el-tab-pane>
<el-tab-pane label="娴佸悜" name="third">
<el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭绾�">
- 閫夋嫨绠＄嚎
+ title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">
+ 閫夋嫨绠℃
</el-button>
<el-table
max-height="200"
@@ -283,7 +283,7 @@
<el-table-column
:show-overflow-tooltip="true"
prop="pipecode"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -291,7 +291,7 @@
sortable
width="100"
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -333,7 +333,7 @@
<el-table-column
:show-overflow-tooltip="true"
prop="pipecode"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
>
</el-table-column>
<el-table-column
@@ -341,7 +341,7 @@
width="100"
sortable
prop="pipecode"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
>
</el-table-column>
<el-table-column
@@ -383,7 +383,7 @@
</el-button>
<!-- <el-card class="box-card">-->
<div slot="header" class="fixed-style">
- <span>绠＄嚎鏌ヨ缁撴灉</span>
+ <span>绠℃鏌ヨ缁撴灉</span>
</div>
<el-table
class="tableBox"
@@ -392,12 +392,12 @@
style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column
prop="pipename"
- label="绠＄嚎鍚嶇О"
+ label="绠℃鍚嶇О"
width="180">
</el-table-column>
<el-table-column
prop="mediumtype"
- label="绠＄嚎绫诲瀷"
+ label="绠℃绫诲瀷"
width="180">
</el-table-column>
<el-table-column
@@ -430,6 +430,7 @@
import eventBus from '../../../../eventBus'
import DrawLine from './AnalysisChoose/DrawLine'
import mapApi from '../../../../api/mapApi'
+import iconUrl from '../../../../assets/images/other.png'
export default {
name: 'SewersAnalysis',
@@ -459,28 +460,28 @@
bgMarker: null,
hdmParam: null,
- // 杩為�氭�� // 1 杩為�氭�ц捣濮嬬绾� 0 杩為�氭�х粨鏉熺绾� 鐢ㄦ潵鍒ゆ柇鏄偣鍑讳簡璧峰 杩樻槸缁撴潫绠＄嚎
+ // 杩為�氭�� // 1 杩為�氭�ц捣濮嬬娈� 0 杩為�氭�х粨鏉熺娈� 鐢ㄦ潵鍒ゆ柇鏄偣鍑讳簡璧峰 杩樻槸缁撴潫绠℃
linkType: 1,
- // 杩為�氭�� 璧峰绠＄嚎 琛ㄦ牸鏁版嵁
+ // 杩為�氭�� 璧峰绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkStart: [],
- // 杩為�氭�� 缁撴潫绠＄嚎 琛ㄦ牸鏁版嵁
+ // 杩為�氭�� 缁撴潫绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkEnd: [],
// 杩為�氭�� 鍒嗘瀽缁撴灉 灞曠ず => 杩為�� || 涓嶈繛閫�
currentLinkIsTrue: '',
// 杩為�氭�� 鍒嗘瀽缁撴灉 琛ㄦ牸鏁版嵁
tableDataLinkResult: [],
- // 鐖嗙 鍙戠敓鐖嗚鐨勭绾� table琛ㄦ牸鏁版嵁
+ // 鐖嗙 鍙戠敓鐖嗚鐨勭娈� table琛ㄦ牸鏁版嵁
bgPipeLine: [],
// 鐖嗙 闇�瑕佸叧闂殑闃�闂� table琛ㄦ牸鏁版嵁
bgFm: [],
- // 娴佸悜 閫夋嫨鐨勭绾� 鐨則able琛ㄦ牸鏁版嵁
+ // 娴佸悜 閫夋嫨鐨勭娈� 鐨則able琛ㄦ牸鏁版嵁
tableDataLiuxiang: [],
// 娴佸悜 鍒嗘瀽缁撴灉 鐨則able琛ㄦ牸鏁版嵁
lxTableDataResult: [],
- // 妯柇闈� 绠＄嚎鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
+ // 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
tableData: [],
echartsList: []
@@ -564,30 +565,24 @@
},
createFlowMarker (point) {
return window.L.marker(point, {
- icon: window.L.divIcon({
- className: 'dIcon',
- // html: '<div class="plane live">' +
- // '<div style="position: absolute;' +
- // ' width: 20px;' +
- // ' height: 20px;' +
- // ' border-radius: 50%;' +
- // ' content: \'\'; background-color: #FF664A;"/>' +
- // '<span></span><span></span></div></>',
- iconSize: [36, 36]
+ icon: window.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
},
- // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠＄嚎e
+ // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
// console.log(e)
- // console.log('鍦板浘鐐瑰嚮璧峰绠＄嚎')
+ // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
- // 杩為�氭�� 璧峰绠＄嚎 table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
+ // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectStart (e) {
- // console.log('閫夋嫨璧峰绠＄嚎')
+ // console.log('閫夋嫨璧峰绠℃')
// this.$refs.singleTable.setCurrentRow(e)
this.currentSelectStart = e
if (this.currentSelectStartLine != null) {
@@ -605,15 +600,15 @@
}).addTo(window.map)
window.map.panInsideBounds(this.currentSelectStartLine.getBounds())
},
- // 杩為�氭�� ===> 鍦板浘鐐瑰嚮缁撴潫绠＄嚎
+ // 杩為�氭�� ===> 鍦板浘鐐瑰嚮缁撴潫绠℃
linkClickEnd () {
- console.log('鍦板浘鐐瑰嚮缁撴潫绠＄嚎')
+ // console.log('鍦板浘鐐瑰嚮缁撴潫绠℃')
this.linkType = 0
this.selectPipeLine()
},
- // 杩為�氭�� 缁撴潫绠＄嚎 table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
+ // 杩為�氭�� 缁撴潫绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectEnd (e) {
- console.log('閫夋嫨缁撴潫绠＄嚎')
+ console.log('閫夋嫨缁撴潫绠℃')
this.currentSelectEnd = e
// 鍋氬垽鏂璻emove
@@ -643,9 +638,9 @@
})
this.linkPipeline = []
}
- // 鍒ゆ柇 濡傛灉璧峰绠＄嚎 缁撴潫绠＄嚎娌℃湁鏁版嵁 鍒欒繑鍥瀎alse 鎻愮ず杩樻湭閫夋嫨璧峰/缁撴潫绠＄嚎
+ // 鍒ゆ柇 濡傛灉璧峰绠℃ 缁撴潫绠℃娌℃湁鏁版嵁 鍒欒繑鍥瀎alse 鎻愮ず杩樻湭閫夋嫨璧峰/缁撴潫绠℃
if (this.currentSelectStart === null || this.currentSelectEnd === null) {
- this.$message('璇烽�夋嫨璧峰绠＄嚎鍜岀粨鏉熺绾�')
+ this.$message('璇烽�夋嫨璧峰绠℃鍜岀粨鏉熺娈�')
return false
}
@@ -654,14 +649,16 @@
startLineID: this.currentSelectStart.pipesegcode,
endLineID: this.currentSelectEnd.pipesegcode
}
- console.log(param)
+ // console.log(param)
// 璇锋眰鎺ュ彛鍜屾暟鎹�
const res = await mapApi.findConnectedPipelines(param)
- console.log(res)
+ // console.log(res)
// 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁
if (res.data.length === 0) {
- this.$message('娌℃湁鎵惧埌杩為�氱殑绠＄嚎')
+ this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
+ // if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
this.currentLinkIsTrue = '涓嶈繛閫�'
+ // }
return
}
this.tableDataLinkResult = res.data
@@ -692,9 +689,8 @@
},
// 杩為�氭�� 鍒嗘瀽缁撴灉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()
@@ -730,12 +726,12 @@
}
},
- // 鐖嗙 ===> 閫夋嫨绠＄嚎
+ // 鐖嗙 ===> 閫夋嫨绠℃
bgClick () {
this.selectPipeLine()
},
async bgSelect (e) {
- console.log('閫夋嫨鐖嗙绠＄嚎')
+ console.log('閫夋嫨鐖嗙绠℃')
console.log(e)
this.bgFm = []
if (this.bgMarker != null) {
@@ -817,7 +813,7 @@
const point = [e.startControlPoint.y, e.startControlPoint.x]
const marker = this.createFlowMarker(point)
marker.addTo(window.map)
- window.map.flyTo(point, 16)
+ window.map.flyTo(point, 17)
},
// 娴佸悜鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁鐐瑰嚮
@@ -880,7 +876,7 @@
this.flowPipeLine = null
}
},
- // 娴佸悜-绠＄嚎閫夋嫨
+ // 娴佸悜-绠℃閫夋嫨
selectRowLiuXiang (e) {
// 閫夋嫨瑕佹樉绀虹殑娴佸悜绾�
// console.log('閫夋嫨瑕佹樉绀虹殑娴佸悜绾�')
@@ -1118,10 +1114,6 @@
background: none !important;
}
- /deep/ .el-table__fixed-right-patch {
- /*display: none;*/
- }
-
/deep/ .el-table__body tr.current-row > td {
background: rgba(0, 16, 30, 1) !important;
}
@@ -1130,6 +1122,11 @@
background: rgba(0, 16, 30, 1) !important;
}
+ /*scroll鍙充晶鍗犱綅*/
+ /deep/ .el-table__fixed-right-patch {
+ display: none;
+ }
+
/*/deep/ .el-tabs--top .el-tabs__item.is-top:nth-child(2) {*/
/* padding-left: 20px;*/
/*}*/
--
Gitblit v1.8.0