From a6135ffcbf7dca73c3ff39ad6f7718880c3abe9a Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期二, 11 五月 2021 10:47:19 +0800
Subject: [PATCH] 企业应急修改
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 8f2624c..d7d9af9 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -13,7 +13,7 @@
<!-- <el-scrollbar style="height:450px">-->
<!-- <el-card shadow="hover">-->
<span class="fixed-style">璧峰绠℃</span>
- <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" @row-click="linkSelectStart" highlight-current-row style="width: 100%" size="mini">
+ <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" highlight-current-row style="width: 100%" size="mini">
<el-table-column prop="datasource" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
@@ -55,8 +55,8 @@
<el-tab-pane label="鐖嗙" style="color: #cccccc" name="second">
<el-row>
<span>鐖嗙锛堢浉鍏冲紑鍏筹級</span>
- <el-button type="primary" @click="bgClick" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
+ <el-button type="primary" @click="bgClick" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-button type="primary" @click="handleClick" size="mini" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
</el-row>
<!-- <el-card shadow="hover">-->
<span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
@@ -86,8 +86,8 @@
<!-- </el-card>-->
</el-tab-pane>
<el-tab-pane label="娴佸悜" name="third">
- <el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-table max-height="200" class="tableBox" :data="tableDataLiuxiang" size="mini">
+ <el-button type="primary" @click="selectPipeLine" size="mini" highlight-current-row title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-table max-height="200" class="tableBox" highlight-current-row :data="tableDataLiuxiang" size="mini">
<el-table-column :show-overflow-tooltip="true" prop="pipecode" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="璧风偣缂栧彿"></el-table-column>
@@ -112,16 +112,16 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
- <div>
- <el-button type="primary" @click="drawLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
- <el-button type="primary" @click="jdmQuery" size="mini" style="margin-bottom: 5px;" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
- <el-button type="primary" @click="jdmClear" size="mini" style="margin-bottom: 5px;" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
- </div>
- <!-- <el-card class="box-card">-->
+ <el-row>
+ <el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
+ <el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
+ <el-button type="primary" @click="jdmClear" size="mini" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
+ </el-row>
+ <!-- <el-card class="box-card">-->
<div slot="header" class="fixed-style">
<span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table class="tableBox" :data="tableData" max-height="200" style="width: 100%" @row-click="selectRow" size="mini">
+ <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column prop="pipename" label="绠℃鍚嶇О"></el-table-column>
<el-table-column prop="mediumtype" label="绠℃绫诲瀷" width="80"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">
@@ -130,7 +130,7 @@
</template>
</el-table-column>
</el-table>
- <!-- </el-card>-->
+ <!-- </el-card>-->
<!-- <el-card class="box-card">
<div slot="header" class="fixed-style">
<span>鏂潰鍥�</span>
@@ -166,7 +166,9 @@
myChart: null,
options: [],
+ echartsList: [],
myChartShow: false,
+
flowPipeLine: null,
// 鐢ㄤ簬鍒ゆ柇
@@ -205,9 +207,7 @@
lxTableDataResult: [],
// 妯柇闈� 绠℃鏌ヨ缁撴灉 鐨則able琛ㄦ牸鏁版嵁
- tableData: [],
-
- echartsList: []
+ tableData: []
}
},
@@ -222,7 +222,8 @@
methods: {
// tab鍒囨崲
handleClick (tab, event) {
- // console.log(tab, event)
+ console.log(event)
+ // console.log(tab)
this.clearLinkPipe()
this.clearLX()
this.linkClear()
@@ -246,27 +247,21 @@
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
- console.log(e)
+ // console.log(e)
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
- // if () {
- // // 鍏抽棴寮圭獥
- // window.layerFactory.clickSwitch = false
- // } else {
- // window.layerFactory.clickSwitch = true
- // }
},
// 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
async getPipeLine (point) {
const param = {
x: point[0],
y: point[1],
- radius: 5
+ radius: 3
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res)
+ console.log(res.pipesegcode)
if (this.activeName === 'first') {
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
@@ -298,13 +293,13 @@
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log(e)
// console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
// 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectStart (e) {
+ // console.log(e)
// console.log('閫夋嫨璧峰绠℃')
// this.$refs.singleTable.setCurrentRow(e)
this.currentSelectStart = e
@@ -331,7 +326,7 @@
},
// 杩為�氭�� 缁撴潫绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectEnd (e) {
- console.log('閫夋嫨缁撴潫绠℃')
+ // console.log('閫夋嫨缁撴潫绠℃')
this.currentSelectEnd = e
// 鍋氬垽鏂璻emove
@@ -345,15 +340,15 @@
style: function (feature) {
return {
weight: 10,
- color: 'rgba(255, 247, 0, 0.6)'
+ color: 'rgba(255, 247, 0, 0.7)'
}
}
}).addTo(window.map)
window.map.panInsideBounds(this.currentSelectEndLine.getBounds())
},
- // 杩為�氭�ф煡璇�
+ // 杩為�氭�ф煡璇� 缁撴灉
async linkQuery () {
- // 姣忔鏌ヨ鍒嗘瀽缁撴灉涓虹┖
+ // 姣忔鏌ヨ鍒嗘瀽缁撴灉鍒剁┖
this.tableDataLinkResult = []
if (this.linkPipeline.length > 1) {
this.linkPipeline.forEach((itm) => {
@@ -379,9 +374,8 @@
// 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
- // if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
+ // 杩涜鍒ゆ柇
this.currentLinkIsTrue = '涓嶈繛閫�'
- // }
return
}
this.tableDataLinkResult = res.data
@@ -670,6 +664,7 @@
},
// 妯柇闈㈡暟鎹姹�
async jdmQuery () {
+ this.tableData = []
if (this.hdmParam == null) {
this.$message('璇峰厛鍦ㄥ湴鍥句笂缁樺埗鎴柇绾�')
return false
@@ -684,6 +679,7 @@
}
this.tableData.push(obj)
}
+ // console.log(this.tableData, 'this.tableData')
this.dealWithData(res)
},
dealWithData (e) {
@@ -845,6 +841,7 @@
/deep/ .el-table__body .el-table__row.hover-row td {
background: none !important;
+ color:yellow;
}
/deep/ .el-table__body tr.current-row > td {
--
Gitblit v1.8.0