From d7c50f6207f0f27f4c20aa96f75b7c0b610b2b23 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期四, 20 五月 2021 11:06:54 +0800
Subject: [PATCH] 管线弹框分析修改
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 622 +++++++++++++-------------------------------------------
1 files changed, 143 insertions(+), 479 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index c2c2e5e..20f74de 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -1,427 +1,54 @@
<template>
<div class="sewers-analysis-tab">
- <!--<transition name="el-fade-in-linear">-->
- <!--<el-card>-->
<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="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠＄嚎">璧峰绠＄嚎
- </el-button>
- <el-button type="primary" @click="linkClickEnd" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑讳笌鎵�閫夌绾胯繛閫氱绾�">缁撴潫绠＄嚎
- </el-button>
- <el-button type="primary" @click="linkQuery" 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-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-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>
- <el-table-column
- sortable
- width="100"
- prop="material"
- label="缁堢偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- fixed="right"
- class-name="fixed-table"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="linkSelectStart(scope.row)" type="text" size="small">閫夋嫨</el-button>
- </template>
- </el-table-column>
- </el-table>
- <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"
- 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
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="linkSelectEnd(scope.row)" type="text" size="small">閫夋嫨</el-button>
- </template>
- </el-table-column>
- </el-table>
- <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"
- @row-click="linkResultSelect"
- 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"
- 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
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
-
- </el-table>
- <!--</el-card>-->
- <!--</el-scrollbar>-->
+ <Connectivity></Connectivity>
</el-tab-pane>
- <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-row>
- <!-- <el-card shadow="hover">-->
- <span class="fixed-style">鍙戠敓鐖嗚鐨勭绾�</span>
- <el-table
- max-height="200"
- class="tableBox"
- ref="singleTable"
- highlight-current-row
- :data="bgPipeLine"
- style="width: 100%" 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>
- <el-table-column
- :show-overflow-tooltip="true"
- sortable
- width="100"
- prop="pipecode"
- label="缁堢偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="bgSelect(scope.row)" type="text" size="small">閫夋嫨</el-button>
- </template>
- </el-table-column>
- </el-table>
- <span class="fixed-style">闇�瑕佸叧闂殑闃�闂�</span>
- <el-table
- class="tableBox"
- highlight-current-row
- max-height="200"
- :data="bgFm"
- @row-click="bgFmClick"
- style="width: 100%" size="mini">
- <el-table-column
- :show-overflow-tooltip="true"
- prop="pipecode"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- :show-overflow-tooltip="true"
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- :show-overflow-tooltip="true"
- width="100"
- 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
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
- </el-table>
- <!-- </el-card>-->
+ <el-tab-pane label="鐖嗙" style="color: #cccccc" name="second">
+ <Tube></Tube>
</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-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>
- <el-table-column
- :show-overflow-tooltip="true"
- sortable
- width="100"
- prop="pipecode"
- label="缁堢偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- width="100"
- >
- <template slot-scope="scope">
- <el-button @click="lxQuery(scope.row)" type="text" size="small">鏄剧ず娴佸悜</el-button>
- </template>
- </el-table-column>
- </el-table>
- <span class="fixed-style">鍒嗘瀽缁撴灉</span>
- <el-table
- class="tableBox"
- highlight-current-row
- max-height="200"
- :data="lxTableDataResult"
- @row-click="lxResultSelect"
- style="width: 100%" size="mini">
-
- <el-table-column
- :show-overflow-tooltip="true"
- prop="pipecode"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- width="100"
- sortable
- 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>
- <el-table-column
- class-name="fixed-table"
- fixed="right"
- label="鎿嶄綔"
- >
- <template slot-scope="scope">
- <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
- </template>
- </el-table-column>
-
- </el-table>
+ <Flow></Flow>
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
- <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>
- <!-- <el-card class="box-card">-->
+ <!-- <CrossSectional></CrossSectional>-->
+ <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>
+ <span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table
- class="tableBox"
- :data="tableData"
- max-height="200"
- style="width: 100%" @row-click="selectRow" size="mini">
- <el-table-column
- prop="pipename"
- label="绠＄嚎鍚嶇О"
- width="180">
- </el-table-column>
- <el-table-column
- prop="mediumtype"
- label="绠＄嚎绫诲瀷"
- width="180">
- </el-table-column>
- <el-table-column
- class-name="fixed-table"
- fixed="right"
- label="鍥捐〃鏌ョ湅"
- >
- <template slot-scope="scope">
- <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button>
- </template>
- </el-table-column>
+ <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="mediumtype" label="浠嬭川绫诲瀷" :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column prop="x" label="鏂潰(缁忓害)" :show-overflow-tooltip="true" width="80"></el-table-column>
+ <el-table-column prop="y" label="鏂潰(绾害)" :show-overflow-tooltip="true" width="80"></el-table-column>
+ <el-table-column prop="z" label="鏂潰(楂樼▼)" :show-overflow-tooltip="true" width="80"></el-table-column>
+ <el-table-column prop="spacing" label="闂磋窛(m)" width="80"></el-table-column>
+ <!-- <el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
- <!-- </el-card>-->
- <el-card class="box-card">
+ <!-- </el-card>-->
+ <!-- <el-card class="box-card">
<div slot="header" class="fixed-style">
<span>鏂潰鍥�</span>
</div>
<span v-show="!myChartShow" style="color: #909399;font-size: 12px;">鏆傛棤鏁版嵁</span>
<div v-show="myChartShow" id="echarts_box" ref="myChart" style="width: 350px;height:200px;"></div>
- </el-card>
+ </el-card> -->
+ <span class="fixed-style">鏂潰鍥�</span>
+ <span v-show="!myChartShow"
+ style="color: #909399;font-size: 12px;height: 200px;display: block;text-align: center;line-height: 200px">鏆傛棤鏁版嵁</span>
+ <div v-show="myChartShow" id="echarts_box" ref="myChart"
+ style="width:350px;height:200px;margin: 0 auto"></div><!-- v-show="myChartShow" -->
</el-tab-pane>
</el-tabs>
- <!--</el-card>-->
- <!--</transition>-->
</div>
</template>
@@ -430,9 +57,20 @@
import eventBus from '../../../../eventBus'
import DrawLine from './AnalysisChoose/DrawLine'
import mapApi from '../../../../api/mapApi'
+import { pulseEffect } from '../../../../utils/utils'
+import Connectivity from './AnalysisChoose/Connectivity'
+import Tube from './AnalysisChoose/Tube'
+import Flow from './AnalysisChoose/Flow'
+// import CrossSectional from './AnalysisChoose/CrossSectional'
export default {
name: 'SewersAnalysis',
+ components: {
+ Connectivity,
+ Tube,
+ Flow
+ // CrossSectional
+ },
data () {
return {
// 鍦板浘鐐瑰嚮绫诲瀷 first杩為�氭�х偣鍑� second鐖嗙鐐瑰嚮 third娴佸悜鐐瑰嚮 fourth妯柇闈�
@@ -442,7 +80,9 @@
myChart: null,
options: [],
+ echartsList: [],
myChartShow: false,
+
flowPipeLine: null,
// 鐢ㄤ簬鍒ゆ柇
@@ -459,31 +99,30 @@
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: []
+ obj: {}
}
},
@@ -498,7 +137,8 @@
methods: {
// tab鍒囨崲
handleClick (tab, event) {
- // console.log(tab, event)
+ console.log(event)
+ // console.log(tab)
this.clearLinkPipe()
this.clearLX()
this.linkClear()
@@ -517,28 +157,22 @@
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
window.map.on('click', this.selectClick)
- // // 鍏抽棴寮圭獥
- window.layerFactory.clickSwitch = false
+ // 鍏抽棴寮圭獥
+ // window.mapManager.clickDialogSwitch = false
},
// 鍦板浘涓婄偣鍑诲洖璋�
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)
@@ -566,29 +200,28 @@
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]
+ html: '<div class="plane live">' +
+ // '<img src="'+require("../../assets/images/map/ship.png")+
+ '<div style="position: absolute;' +
+ ' width: 20px;' +
+ ' height: 20px;' +
+ ' border-radius: 50%;' +
+ ' content: \'\'; background-color: #FF664A;"/>' +
+ '<span></span><span></span></div></>',
+ iconSize: [90, 36]
})
})
},
- // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠＄嚎e
+ // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
linkClickStart (e) {
- // console.log(e)
- // console.log('鍦板浘鐐瑰嚮璧峰绠＄嚎')
+ // console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
},
- // 杩為�氭�� 璧峰绠＄嚎 table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
+ // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectStart (e) {
- // console.log('閫夋嫨璧峰绠＄嚎')
- // this.$refs.singleTable.setCurrentRow(e)
+ // console.log(e)
this.currentSelectStart = e
if (this.currentSelectStartLine != null) {
this.currentSelectStartLine.remove()
@@ -605,15 +238,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
@@ -627,15 +260,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) => {
@@ -643,9 +276,9 @@
})
this.linkPipeline = []
}
- // 鍒ゆ柇 濡傛灉璧峰绠＄嚎 缁撴潫绠＄嚎娌℃湁鏁版嵁 鍒欒繑鍥瀎alse 鎻愮ず杩樻湭閫夋嫨璧峰/缁撴潫绠＄嚎
+ // 鍒ゆ柇 濡傛灉璧峰绠℃ 缁撴潫绠℃娌℃湁鏁版嵁 鍒欒繑鍥瀎alse 鎻愮ず杩樻湭閫夋嫨璧峰/缁撴潫绠℃
if (this.currentSelectStart === null || this.currentSelectEnd === null) {
- this.$message('璇烽�夋嫨璧峰绠＄嚎鍜岀粨鏉熺绾�')
+ this.$message('璇烽�夋嫨璧峰绠℃鍜岀粨鏉熺娈�')
return false
}
@@ -657,10 +290,11 @@
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('娌℃湁鎵惧埌杩為�氱殑绠℃')
+ // 杩涜鍒ゆ柇
this.currentLinkIsTrue = '涓嶈繛閫�'
return
}
@@ -690,11 +324,10 @@
this.linkPipeline.push(line)
})
},
- // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢
+ // 瀹氫綅鏂规硶浜嬩欢
linkResultSelect (e) {
- console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
+ // console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
console.log(e)
-
const geom = JSON.parse(e.geomText)
if (this.currentSelectResultLine != null) {
this.currentSelectResultLine.remove()
@@ -730,13 +363,13 @@
}
},
- // 鐖嗙 ===> 閫夋嫨绠＄嚎
+ // 鐖嗙 ===> 閫夋嫨绠℃
bgClick () {
this.selectPipeLine()
},
async bgSelect (e) {
- console.log('閫夋嫨鐖嗙绠＄嚎')
- console.log(e)
+ // console.log('閫夋嫨鐖嗙绠℃')
+ // console.log(e)
this.bgFm = []
if (this.bgMarker != null) {
this.bgMarker.remove()
@@ -778,14 +411,13 @@
this.bgPoint = res.data[0].startControlPoint
- const point = JSON.parse(this.bgPoint.geomText)
-
- const p = [point.coordinates[1], point.coordinates[0]]
-
- this.bgMarker = this.createFlowMarker(p)
+ // const point = JSON.parse(this.bgPoint.geomText)
+ // const p = [point.coordinates[1], point.coordinates[0]]
+ // this.bgMarker = this.createFlowMarker(p)
+ // this.bgMarker = pulseEffect(p)
// this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
- this.bgMarker.addTo(window.map)
- window.map.flyTo(p)
+ // this.bgMarker.addTo(window.map)
+ // window.map.flyTo(p)
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -812,12 +444,13 @@
},
bgFmClick (e) {
// console.log('鐐瑰嚮褰卞搷鐨勯榾闂�')
- console.log(e)
+ // console.log(e)
// const point = [e.data[0][0], e.data[0][1]]
const point = [e.startControlPoint.y, e.startControlPoint.x]
- const marker = this.createFlowMarker(point)
- marker.addTo(window.map)
- window.map.flyTo(point, 16)
+ pulseEffect(point)
+ // const marker = this.createFlowMarker(point)
+ // marker.addTo(window.map)
+ // window.map.flyTo(point, 17)
},
// 娴佸悜鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁鐐瑰嚮
@@ -880,7 +513,7 @@
this.flowPipeLine = null
}
},
- // 娴佸悜-绠＄嚎閫夋嫨
+ // 娴佸悜-绠℃閫夋嫨
selectRowLiuXiang (e) {
// 閫夋嫨瑕佹樉绀虹殑娴佸悜绾�
// console.log('閫夋嫨瑕佹樉绀虹殑娴佸悜绾�')
@@ -951,20 +584,31 @@
},
// 妯柇闈㈡暟鎹姹�
async jdmQuery () {
+ this.tableData = []
if (this.hdmParam == null) {
this.$message('璇峰厛鍦ㄥ湴鍥句笂缁樺埗鎴柇绾�')
return false
}
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
+ console.log(res)
const dataPoint = res.data.point
+ // 瀛樺偍闂磋窛list
+ const spacingList = res.data.pointInterval.reverse()
+ // console.log(spacingList)
for (let i = 0; i < dataPoint.length; i++) {
const obj = {
- pipename: dataPoint[i].pipelines.extraData.pipename,
- mediumtype: dataPoint[i].pipelines.extraData.mediumtype
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype,
+ x: parseFloat(dataPoint[i].crossPoint3D.x).toFixed(4),
+ y: parseFloat(dataPoint[i].crossPoint3D.y).toFixed(4),
+ z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(4),
+ spacing: spacingList[i - 1]
}
this.tableData.push(obj)
}
+ // spacingList.reverse()
+ // console.log(spacingList)
+ // console.log(this.tableData)
this.dealWithData(res)
},
dealWithData (e) {
@@ -1019,10 +663,11 @@
}
},
grid: {
- // left: '3%',
- // right: '4%',
- // bottom: '3%',
- // containLabel: true
+ left: '10px',
+ right: '0',
+ top: '10px',
+ bottom: '5px',
+ containLabel: true
},
xAxis: [
{
@@ -1087,6 +732,15 @@
</script>
<style lang="less" scoped>
+ /deep/ .el-tabs .el-tabs__item {
+ height: 20px;
+ line-height: 20px;
+ }
+
+ /deep/ .el-tabs--border-card > .el-tabs__content {
+ padding: 5px;
+ }
+
/deep/ .el-table .has-gutter tr th {
border: none !important;
}
@@ -1100,10 +754,10 @@
}
/deep/ .fixed-style {
+ /*margin: 15px;*/
font-size: 12px;
display: inline-block;
- color: #ffffff;
- margin: 15px;
+ color: #00fff6;
}
/deep/ th.is-leaf {
@@ -1114,12 +768,13 @@
background: none;
}
- /deep/ .el-table__body .el-table__row.hover-row td {
- background: none !important;
+ /deep/ .el-table__empty-text {
+ line-height: 170px;
}
- /deep/ .el-table__fixed-right-patch {
- /*display: none;*/
+ /deep/ .el-table__body .el-table__row.hover-row td {
+ background: none !important;
+ color: yellow;
}
/deep/ .el-table__body tr.current-row > td {
@@ -1130,6 +785,15 @@
background: rgba(0, 16, 30, 1) !important;
}
+ /*scroll鍙充晶鍗犱綅*/
+ /deep/ .el-table__fixed-right-patch {
+ display: none;
+ }
+
+ /deep/ .el-tab-pane {
+ min-height: 506.19px;
+ }
+
/*/deep/ .el-tabs--top .el-tabs__item.is-top:nth-child(2) {*/
/* padding-left: 20px;*/
/*}*/
--
Gitblit v1.8.0