From c60e56e2b6ceb633c6b10f5dc52e3da88129ad70 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 21 五月 2021 17:35:41 +0800
Subject: [PATCH] 管线分析相关功能问题修改
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 3d4167b..e7b8aeb 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -10,11 +10,14 @@
<span class="fixed-style">璧峰绠℃</span>
<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"
+ <el-table-column prop="mediumtype" label="绠℃绫诲瀷"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipename"
label="绠℃鍚嶇О"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="缁堢偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="startpointnumber" label="璧风偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="endpointnumber" label="缁堢偣缂栧彿"></el-table-column>
+<!-- <el-table-column v-for="(item, index) in tableDataLinkStartList" :key="index" :prop="item.prop"-->
+<!-- :label="item.label" :show-overflow-tooltip="true" min-width="100" :sortable="item.sortable">-->
+<!-- </el-table-column>-->
<el-table-column width="40" fixed="right" class-name="fixed-table" label="鎿嶄綔">
<template slot-scope="scope">
<el-button @click="linkSelectStart(scope.row)" type="text" size="small">閫夋嫨</el-button>
@@ -24,11 +27,11 @@
<span class="fixed-style">缁撴潫绠℃</span>
<el-table class="tableBox" height="100" max-height="200" highlight-current-row :data="tableDataLinkEnd"
@row-click="linkSelectEnd" 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"
+ <el-table-column prop="mediumtype" label="绠℃绫诲瀷"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipename"
label="绠℃鍚嶇О"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="缁堢偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="startpointnumber" label="璧风偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="endpointnumber" label="缁堢偣缂栧彿"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鎿嶄綔" width="40">
<template slot-scope="scope">
<el-button @click="linkSelectEnd(scope.row)" type="text" size="small">閫夋嫨</el-button>
@@ -38,11 +41,11 @@
<span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;margin-left: 15px">{{ currentLinkIsTrue }}</span></span>
<el-table class="tableBox" highlight-current-row max-height="200" :data="tableDataLinkResult"
style="width: 100%" size="mini">
- <el-table-column prop="material" label="绠℃绫诲瀷"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode"
+ <el-table-column prop="mediumtype" label="绠℃绫诲瀷"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipename"
label="绠℃鍚嶇О"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
- <el-table-column sortable width="100" prop="material" label="缁堢偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="startpointnumber" label="璧风偣缂栧彿"></el-table-column>
+ <el-table-column sortable width="100" prop="endpointnumber" label="缁堢偣缂栧彿"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鎿嶄綔" width="40">
<template slot-scope="scope">
<el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
@@ -56,16 +59,39 @@
<script>
import mapApi from '../../../../../api/mapApi'
+import eventBus from '../../../../../eventBus'
import { createFlowLine } from './PublicWay'
export default {
name: 'Connectivity',
+ props: ['tableData'],
data () {
return {
// 杩為�氭�� // 1 杩為�氭�ц捣濮嬬娈� 0 杩為�氭�х粨鏉熺娈� 鐢ㄦ潵鍒ゆ柇鏄偣鍑讳簡璧峰 杩樻槸缁撴潫绠℃
linkType: 1,
// 杩為�氭�� 璧峰绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkStart: [],
+ tableDataLinkStartList: [// table 琛ㄦ牸瀹氫箟鐨勫瓧娈�
+ {
+ label: '绠℃绫诲瀷',
+ prop: 'datasource'
+ },
+ {
+ label: '绠℃鍚嶇О',
+ prop: 'pipecode',
+ sortable: true
+ },
+ {
+ label: '璧风偣缂栧彿',
+ prop: 'material',
+ sortable: true
+ },
+ {
+ label: '缁堢偣缂栧彿',
+ prop: 'material',
+ sortable: true
+ }
+ ],
// 杩為�氭�� 缁撴潫绠℃ 琛ㄦ牸鏁版嵁
tableDataLinkEnd: [],
// 杩為�氭�� 鍒嗘瀽缁撴灉 灞曠ず => 杩為�� || 涓嶈繛閫�
@@ -81,18 +107,30 @@
flowPipeLine: null
}
},
+ mounted () {
+ this.$nextTick(() => {
+ eventBus.$on('tabData-change', (obj) => {
+ if (obj) {
+ this.handleClick()
+ }
+ })
+ })
+ },
methods: {
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
window.map.on('click', this.selectClick)
- // 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
+ // window.mapManager.clickDialogSwitch = false
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
+ // console.log(e)
window.map.off('click', this.selectClick)
+ window.mapManager.clickDialogSwitch = false
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
+ // this.getPipeLine(point, this.linkType)
+ // window.mapManager.clickDialogSwitch = true
},
// 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
async getPipeLine (point) {
@@ -103,7 +141,7 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- // console.log(res)
+ console.log(res)
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
} else {
@@ -112,7 +150,6 @@
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
@@ -203,7 +240,11 @@
const geom = JSON.parse(itm.geomText)
const points = []
geom.coordinates.forEach((it, id) => {
- points.push(it.reverse())
+ const item = it.reverse()
+ if (it.length > 2) {
+ item.shift()
+ }
+ points.push(item)
})
linkPipe.push(points)
})
@@ -240,7 +281,8 @@
window.map.panInsideBounds(this.currentSelectResultLine.getBounds())
},
// 杩為�氭�х殑娓呴櫎鍔熻兘
- linkClear () {
+ handleClick () {
+ // this.linkClear()
if (this.currentSelectStartLine != null) {
this.currentSelectStartLine.remove()
this.currentSelectStartLine = null
@@ -253,9 +295,6 @@
this.currentSelectResultLine.remove()
this.currentSelectResultLine = null
}
- },
- handleClick () {
- this.linkClear()
this.currentLinkIsTrue = ''
this.tableDataLinkStart = []
this.tableDataLinkEnd = []
--
Gitblit v1.8.0