From 434f7fadbdc1f9afb39305a05716d3560302d1ca Mon Sep 17 00:00:00 2001
From: 陈泽平 <qibolin02429@126.com>
Date: 星期五, 14 五月 2021 16:25:52 +0800
Subject: [PATCH] 分析爆管高亮
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 146 +++++++++++++++++++++++++++++++-----------------
1 files changed, 93 insertions(+), 53 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index e85728c..9b9785b 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -4,18 +4,21 @@
<!--<el-card>-->
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="杩為�氭��" name="first">
- <el-row>
- <el-button type="primary" @click="linkClickStart" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃</el-button>
- <el-button type="primary" @click="linkClickEnd" size="mini" title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃</el-button>
- <el-button type="primary" @click="linkQuery" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�</el-button>
- <el-button type="primary" @click="handleClick" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎</el-button>
- </el-row>
+ <el-row>
+ <el-button type="primary" @click="linkClickStart" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃
+ </el-button>
+ <el-button type="primary" @click="linkClickEnd" size="mini" title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃</el-button>
+ <el-button type="primary" @click="linkQuery" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�</el-button>
+ <el-button type="primary" @click="handleClick" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎</el-button>
+ </el-row>
<!-- <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" 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 :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 width="40" fixed="right" class-name="fixed-table" label="鎿嶄綔">
@@ -25,9 +28,11 @@
</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 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 :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="鎿嶄綔" width="40">
@@ -37,9 +42,11 @@
</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" style="width: 100%" size="mini">
+ <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" 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="鎿嶄綔" width="40">
@@ -55,16 +62,20 @@
<el-tab-pane label="鐖嗙" style="color: #cccccc" name="second">
<el-row>
<span>鐖嗙锛堢浉鍏冲紑鍏筹級</span>
- <el-button type="primary" @click="bgClick" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-button type="primary" @click="handleClick" size="mini" 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>
- <el-table max-height="200" class="tableBox" ref="singleTable" highlight-current-row :data="bgPipeLine" style="width: 100%" size="mini">
+ <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 :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="40">
<template slot-scope="scope">
<el-button @click="bgSelect(scope.row)" type="text" size="small">閫夋嫨</el-button>
@@ -72,11 +83,15 @@
</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 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 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="鎿嶄綔" width="40">
<template slot-scope="scope">
<el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
@@ -86,12 +101,17 @@
<!-- </el-card>-->
</el-tab-pane>
<el-tab-pane label="娴佸悜" name="third">
- <el-button type="primary" @click="selectPipeLine" size="mini" highlight-current-row title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
+ <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>
- <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 :show-overflow-tooltip="true" sortable width="100" prop="pipecode"
+ label="缁堢偣缂栧彿"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鎿嶄綔" width="60">
<template slot-scope="scope">
<el-button @click="lxQuery(scope.row)" type="text" size="small">鏄剧ず娴佸悜</el-button>
@@ -99,11 +119,15 @@
</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 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 :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="鎿嶄綔" width="40">
<template slot-scope="scope">
<el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
@@ -113,18 +137,19 @@
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
<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-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" height="150" 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">
+ <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>
@@ -139,8 +164,10 @@
<div v-show="myChartShow" id="echarts_box" ref="myChart" style="width: 350px;height:200px;"></div>
</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" -->
+ <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>-->
@@ -153,7 +180,8 @@
import eventBus from '../../../../eventBus'
import DrawLine from './AnalysisChoose/DrawLine'
import mapApi from '../../../../api/mapApi'
-import iconUrl from '../../../../assets/images/other.png'
+import { pulseEffect } from '../../../../utils/utils'
+// import iconUrl from '../../../../assets/images/other.png'
export default {
name: 'SewersAnalysis',
@@ -283,10 +311,17 @@
},
createFlowMarker (point) {
return window.L.marker(point, {
- icon: window.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
+ icon: window.L.divIcon({
+ className: 'dIcon',
+ 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]
})
})
},
@@ -495,10 +530,11 @@
const p = [point.coordinates[1], point.coordinates[0]]
- this.bgMarker = this.createFlowMarker(p)
+ // 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) => {
@@ -528,9 +564,10 @@
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, 17)
+ // const marker = this.createFlowMarker(point)
+ pulseEffect(point)
+ // marker.addTo(window.map)
+ // window.map.flyTo(point, 17)
},
// 娴佸悜鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁鐐瑰嚮
@@ -803,13 +840,15 @@
</script>
<style lang="less" scoped>
- /deep/ .el-tabs .el-tabs__item{
+ /deep/ .el-tabs .el-tabs__item {
height: 20px;
line-height: 20px;
}
- /deep/ .el-tabs--border-card>.el-tabs__content{
+
+ /deep/ .el-tabs--border-card > .el-tabs__content {
padding: 5px;
}
+
/deep/ .el-table .has-gutter tr th {
border: none !important;
}
@@ -836,13 +875,14 @@
/deep/ .el-table__fixed-right::before, .el-table__fixed::before {
background: none;
}
- /deep/ .el-table__empty-text{
+
+ /deep/ .el-table__empty-text {
line-height: 170px;
}
/deep/ .el-table__body .el-table__row.hover-row td {
background: none !important;
- color:yellow;
+ color: yellow;
}
/deep/ .el-table__body tr.current-row > td {
@@ -858,7 +898,7 @@
display: none;
}
- /deep/ .el-tab-pane{
+ /deep/ .el-tab-pane {
min-height: 506.19px;
}
--
Gitblit v1.8.0