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 | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index a717a7a..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>
@@ -112,16 +112,16 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
- <div>
+ <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>
- </div>
+ </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" highlight-current-row 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">
@@ -247,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
@@ -305,6 +299,7 @@
},
// 杩為�氭�� 璧峰绠℃ 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) => {
@@ -380,9 +375,7 @@
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
// 杩涜鍒ゆ柇
- // if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
this.currentLinkIsTrue = '涓嶈繛閫�'
- // }
return
}
this.tableDataLinkResult = res.data
--
Gitblit v1.8.0