From bc01f19e361a4c05748942de1b968cf85fbee08b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期五, 30 四月 2021 12:33:34 +0800
Subject: [PATCH] 管线分析功能样式表格修改
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 215 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 145 insertions(+), 70 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 3894691..f19e7c4 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -1,7 +1,7 @@
<template>
<div class="sewers-analysis-tab">
- <!-- <transition name="el-fade-in-linear">-->
- <!-- <el-card>-->
+ <!--<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;"
@@ -20,8 +20,9 @@
<!-- <el-card shadow="hover">-->
<span class="fixed-style">璧峰绠℃</span>
<el-table
+ class="tableBox"
:data="tableDataLinkStart"
- max-height="200"
+ max-height="100"
@row-click="linkSelectStart"
style="width: 100%" size="mini">
<el-table-column
@@ -53,7 +54,6 @@
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -63,6 +63,7 @@
</el-table>
<span class="fixed-style">缁撴潫绠℃</span>
<el-table
+ class="tableBox"
height="100"
max-height="200"
highlight-current-row
@@ -98,7 +99,7 @@
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
+
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -106,8 +107,9 @@
</template>
</el-table-column>
</el-table>
- <span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;">{{ currentLinkIsTrue }}</span></span>
+ <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"
@@ -115,11 +117,12 @@
style="width: 100%" size="mini">
<el-table-column
- prop="lineloopna"
+ prop="material"
label="绠＄嚎绫诲瀷"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
prop="pipecode"
@@ -129,20 +132,20 @@
<el-table-column
sortable
width="100"
- prop="startpoint"
+ prop="material"
label="璧风偣缂栧彿"
>
</el-table-column>
<el-table-column
sortable
width="100"
- prop="endpointnu"
+ prop="material"
label="缁堢偣缂栧彿"
>
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
+
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -151,8 +154,8 @@
</el-table-column>
</el-table>
- <!-- </el-card>-->
- <!-- </el-scrollbar>-->
+ <!--</el-card>-->
+ <!--</el-scrollbar>-->
</el-tab-pane>
<el-tab-pane label="鐖嗙" style=";color: #cccccc" name="second">
<el-row>
@@ -166,16 +169,20 @@
<!-- <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"
@@ -183,6 +190,7 @@
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
prop="pipecode"
@@ -190,6 +198,7 @@
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
prop="pipecode"
@@ -198,7 +207,7 @@
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
+
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -208,17 +217,21 @@
</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="lineloopna"
label="绠＄嚎绫诲瀷"
>
</el-table-column>
<el-table-column
sortable
+ :show-overflow-tooltip="true"
width="100"
prop="pipecode"
label="绠＄嚎鍚嶇О"
@@ -226,12 +239,14 @@
</el-table-column>
<el-table-column
sortable
+ :show-overflow-tooltip="true"
width="100"
prop="startpoint"
label="璧风偣缂栧彿"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
prop="endpointnu"
@@ -241,7 +256,7 @@
<el-table-column
class-name="fixed-table"
- fixed="right"
+
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -257,13 +272,17 @@
閫夋嫨绠℃
</el-button>
<el-table
+ max-height="200"
+ class="tableBox"
:data="tableDataLiuxiang" size="mini">
<el-table-column
- prop="lineloopna"
+ :show-overflow-tooltip="true"
+ prop="pipecode"
label="绠＄嚎绫诲瀷"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
prop="pipecode"
@@ -271,22 +290,23 @@
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
- prop="startpoint"
+ prop="pipecode"
label="璧风偣缂栧彿"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
- prop="endpointnu"
+ prop="pipecode"
label="缁堢偣缂栧彿"
>
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
label="鎿嶄綔"
width="100"
>
@@ -297,6 +317,7 @@
</el-table>
<span class="fixed-style">鍒嗘瀽缁撴灉</span>
<el-table
+ class="tableBox"
highlight-current-row
max-height="200"
:data="lxTableDataResult"
@@ -304,11 +325,13 @@
style="width: 100%" size="mini">
<el-table-column
- prop="lineloopna"
+ :show-overflow-tooltip="true"
+ prop="pipecode"
label="绠＄嚎绫诲瀷"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
width="100"
sortable
prop="pipecode"
@@ -316,22 +339,23 @@
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
- prop="startpoint"
+ prop="pipecode"
label="璧风偣缂栧彿"
>
</el-table-column>
<el-table-column
+ :show-overflow-tooltip="true"
sortable
width="100"
- prop="endpointnu"
+ prop="pipecode"
label="缁堢偣缂栧彿"
>
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
label="鎿嶄綔"
>
<template slot-scope="scope">
@@ -354,21 +378,23 @@
<span>绠＄嚎鏌ヨ缁撴灉</span>
</div>
<el-table
+ class="tableBox"
:data="tableData"
+ max-height="200"
style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column
- prop="name"
+ prop="pipename"
label="绠＄嚎鍚嶇О"
width="180">
</el-table-column>
<el-table-column
- prop="type"
+ prop="mediumtype"
label="绠＄嚎绫诲瀷"
width="180">
</el-table-column>
<el-table-column
class-name="fixed-table"
- fixed="right"
+
label="鍥捐〃鏌ョ湅"
>
<template slot-scope="scope">
@@ -386,8 +412,8 @@
</el-card>
</el-tab-pane>
</el-tabs>
- <!-- </el-card>-->
- <!-- </transition>-->
+ <!--</el-card>-->
+ <!--</transition>-->
</div>
</template>
@@ -465,6 +491,7 @@
this.clearLX()
this.linkClear()
this.jdmClear()
+ this.currentLinkIsTrue = ''
this.bgFm = []
this.bgPipeLine = []
this.tableData = []
@@ -472,6 +499,7 @@
this.tableDataLinkStart = []
this.tableDataLinkEnd = []
this.tableDataLinkResult = []
+ this.lxTableDataResult = []
},
// 娴佸悜鍦板浘涓婄偣鍑�
@@ -503,7 +531,9 @@
this.bgPipeLine = res.data
} else if (this.activeName === 'third') {
this.tableDataLiuxiang = res.data
- } else if (this.activeName === 'fourth') {}
+ } else if (this.activeName === 'fourth') {
+ }
+ // debugger
console.log(res.data)
},
// 娴佸悜鏄剧ず 鐨勬柟娉曞弬鏁板皝
@@ -511,6 +541,22 @@
const flowLine = window.L.polyline(param.points, param.option)
flowLine.addTo(window.map)
return flowLine
+ },
+ createFlowMarker (point) {
+ return window.L.marker(point, {
+ 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]
+ })
+ })
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
@@ -577,11 +623,13 @@
this.$message('璇烽�夋嫨璧峰绠℃鍜岀粨鏉熺娈�')
return false
}
+
// 璇锋眰鏁版嵁鏃剁殑鍙傛暟
const param = {
- startLineID: this.currentSelectStart.id,
- endLineID: this.currentSelectEnd.id
+ startLineID: this.currentSelectStart.pipesegcode,
+ endLineID: this.currentSelectEnd.pipesegcode
}
+ console.log(param)
// 璇锋眰鎺ュ彛鍜屾暟鎹�
const res = await mapApi.findConnectedPipelines(param)
console.log(res)
@@ -619,23 +667,23 @@
},
// 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢
linkResultSelect (e) {
- // console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
- // console.log(e)
+ console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
+ console.log(e)
- // const geom = JSON.parse(e.geomText)
- // if (this.currentSelectResultLine != null) {
- // this.currentSelectResultLine.remove()
- // this.currentSelectResultLine = null
- // }
- // this.currentSelectResultLine = L.geoJSON(geom, {
- // style: function (feature) {
- // return {
- // color: 'rgba(255,0,0,.6)',
- // weight: 6
- // }
- // }
- // }).addTo(this.map)
- // this.map.panInsideBounds(this.currentSelectResultLine.getBounds())
+ const geom = JSON.parse(e.geomText)
+ if (this.currentSelectResultLine != null) {
+ this.currentSelectResultLine.remove()
+ this.currentSelectResultLine = null
+ }
+ this.currentSelectResultLine = window.L.geoJSON(geom, {
+ style: function (feature) {
+ return {
+ color: 'rgba(255,0,0,.6)',
+ weight: 6
+ }
+ }
+ }).addTo(window.map)
+ window.map.panInsideBounds(this.currentSelectResultLine.getBounds())
},
// 杩為�氭�х殑娓呴櫎鍔熻兘
linkClear () {
@@ -686,7 +734,7 @@
// 鏁版嵁璇锋眰鍙傛暟
const param = {
- lineID: e.id
+ lineID: e.pipesegcode
}
const res = await mapApi.findLeakages(param)
console.log(res)
@@ -698,6 +746,7 @@
}
res.data.reverse()
this.bgFm = res.data
+ console.log(res.data)
this.bgPoint = res.data[0].startControlPoint
@@ -705,10 +754,10 @@
const p = [point.coordinates[1], point.coordinates[0]]
- // this.bgMarker = main.createFlowMarker(p)
+ this.bgMarker = this.createFlowMarker(p)
this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
- this.bgMarker.addTo(this.map)
- this.map.flyTo(p)
+ this.bgMarker.addTo(window.map)
+ window.map.flyTo(p)
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -717,7 +766,6 @@
geom.coordinates.forEach((it, id) => {
points.push(it.reverse())
})
-
linkPipe.push(points)
})
@@ -745,8 +793,8 @@
// 娴佸悜鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁鐐瑰嚮
lxResultSelect (e) {
- console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
- console.log(e)
+ // console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
+ // console.log(e)
const geom = JSON.parse(e.geomText)
if (this.currentSelectResultLine != null) {
@@ -762,17 +810,13 @@
},
// 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀�
async lxQuery (e) {
- // console.log(e)
+ console.log(e)
this.clearLinkPipe()
const param = {
// lineNodeID: e.startpoint
- lineNodeID: e.gid
+ lineNodeID: e.startpointnumber
}
const res = await mapApi.findFlowDirection(param)
- this.getres(res)
- },
- // 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀� 鐨勬暟鎹鐞嗘柟娉�
- getres (res) {
this.lxTableDataResult = res.data
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -797,6 +841,10 @@
this.linkPipeline.push(line)
})
},
+ // 鐐瑰嚮鏄剧ず娴佸悜 table鍒楄〃涓殑鏁版嵁 => 杩涜瀹樼綉娴佸悜鐨勬樉绀� 鐨勬暟鎹鐞嗘柟娉�
+ // getres (res) {
+ //
+ // },
// 娓呴櫎娴佸悜
clearLX () {
if (this.flowPipeLine != null) {
@@ -882,14 +930,26 @@
// 宸茬粯鍒剁嚎鍥� 杩涜缁樺埗妯柇闈㈡暟鎹垎鏋�
const res = await mapApi.getCrossSection(this.hdmParam)
console.log(res)
+ const dataPoint = res.data.point
+ console.log(dataPoint)
+ // this.tableData = dataPoint.pipelines.extraData
+ for (let i = 0; i < dataPoint.length; i++) {
+ const obj = {
+ pipename: dataPoint[i].pipelines.extraData.pipename,
+ mediumtype: dataPoint[i].pipelines.extraData.mediumtype
+ }
+ this.tableData.push(obj)
+ }
},
// 妯柇闈㈢粯鍒跺畬鎴愬悗 杩涜妯柇闈㈡暟鎹垎鏋� 杩涜鍥捐〃灞曠ず
async selectRow (e) {
console.log(e)
+ // option 鏁版嵁澶勭悊 const dataSeries = e.data.pointInterval
// 3. 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁锛屾樉绀哄浘琛�
const option = {
xAxis: {
type: 'category',
+ // data: ['浜�1', '浜�2', '浜�3', '浜�4', '浜�5', '浜�6', '浜�7']
data: ['浜�1', '浜�2', '浜�3', '浜�4', '浜�5', '浜�6', '浜�7']
},
yAxis: {
@@ -897,10 +957,11 @@
},
series: [{
data: [820, 932, 901, 934, 1290, 1330, 1320],
+ // data: dataSeries,
type: 'line'
}]
}
- // this.myChartShow = true
+ this.myChartShow = true
this.myChart.setOption(option)
},
// 妯柇闈㈡竻闄�
@@ -915,17 +976,31 @@
</script>
<style lang="less" scoped>
-///deep/ .el-table__row:hover > td {
-// background: none !important;
-//}
-//
-///deep/ .el-table__row--striped:hover > td {
-// background: none !important;
-//}
+/*****婊氬姩鏉�***/
+/deep/ .tableBox {
+ .el-table__fixed-right-patch {
+ display: none;
+ }
+}
-///deep/ .el-table__row.hover-row {
-// background: rgba(0, 16, 30, 0.9) !important
-//}
+/deep/ .tableBox::-webkit-scrollbar {
+ /*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 10px;
+}
+
+/deep/ .tableBox::-webkit-scrollbar-thumb {
+ /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ background: #000;
+}
+
+/deep/ .tableBox::-webkit-scrollbar-track {
+ /*婊氬姩鏉￠噷闈㈣建閬�*/
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: @background-color;
+ border-radius: 10px;
+}
/deep/ .el-table .has-gutter tr th {
border: none !important;
--
Gitblit v1.8.0