From 309528a5c1ac91b5f3a8faa28b6c57b3531d45c2 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 24 五月 2021 17:28:10 +0800
Subject: [PATCH] top位置
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 108 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 3d4167b..6812567 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -10,11 +10,11 @@
<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 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 +24,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 +38,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,6 +56,7 @@
<script>
import mapApi from '../../../../../api/mapApi'
+import eventBus from '../../../../../eventBus'
import { createFlowLine } from './PublicWay'
export default {
@@ -81,15 +82,25 @@
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.mapManager.clickDialogSwitch = true
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
this.getPipeLine(point)
@@ -110,9 +121,38 @@
this.tableDataLinkEnd = res.data
}
},
+ // 杩為�氭�х殑娓呴櫎鍔熻兘
+ handleClick () {
+ // this.linkClear()
+ if (this.currentSelectStartLine != null) {
+ this.currentSelectStartLine.remove()
+ this.currentSelectStartLine = null
+ }
+ if (this.currentSelectEndLine != null) {
+ this.currentSelectEndLine.remove()
+ this.currentSelectEndLine = null
+ }
+ if (this.currentSelectResultLine != null) {
+ this.currentSelectResultLine.remove()
+ this.currentSelectResultLine = null
+ }
+ this.currentLinkIsTrue = ''
+ this.tableDataLinkStart = []
+ this.tableDataLinkEnd = []
+ this.tableDataLinkResult = []
+ if (this.flowPipeLine != null) {
+ this.flowPipeLine.remove()
+ this.flowPipeLine = null
+ }
+ if (this.linkPipeline.length > 0) {
+ this.linkPipeline.forEach((itm, idx) => {
+ itm.remove()
+ })
+ }
+ this.linkPipeline = []
+ },
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
@@ -203,7 +243,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)
})
@@ -238,38 +282,6 @@
}
}).addTo(window.map)
window.map.panInsideBounds(this.currentSelectResultLine.getBounds())
- },
- // 杩為�氭�х殑娓呴櫎鍔熻兘
- linkClear () {
- if (this.currentSelectStartLine != null) {
- this.currentSelectStartLine.remove()
- this.currentSelectStartLine = null
- }
- if (this.currentSelectEndLine != null) {
- this.currentSelectEndLine.remove()
- this.currentSelectEndLine = null
- }
- if (this.currentSelectResultLine != null) {
- this.currentSelectResultLine.remove()
- this.currentSelectResultLine = null
- }
- },
- handleClick () {
- this.linkClear()
- this.currentLinkIsTrue = ''
- this.tableDataLinkStart = []
- this.tableDataLinkEnd = []
- this.tableDataLinkResult = []
- if (this.flowPipeLine != null) {
- this.flowPipeLine.remove()
- this.flowPipeLine = null
- }
- if (this.linkPipeline.length > 0) {
- this.linkPipeline.forEach((itm, idx) => {
- itm.remove()
- })
- }
- this.linkPipeline = []
}
}
}
--
Gitblit v1.8.0