From 8e8340911055cea995d410d98e0eeabf84e2e53f Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期二, 27 四月 2021 17:20:47 +0800
Subject: [PATCH] 样式/接口调整
---
src/assets/css/map/map-panel-style.less | 8
src/components/BaseNav/WasteGas/DayData.vue | 196 +------
src/components/panel/ToolBoxPanel.vue | 58 +
src/api/mapApi.js | 16
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 957 ++++++++++++++++++++-------------------
src/api/mapUrl.js | 12
src/components/BaseNav/WasteGas/HourData.vue | 174 +-----
7 files changed, 627 insertions(+), 794 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 515f8fb..58df7b6 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -69,5 +69,21 @@
},
DataItems (data) {
return axios.get(mapUrl.DataItems, data)
+ },
+ // 绠＄嚎杩為�氭��
+ findConnectedPipelines (data) {
+ return axios.get(mapUrl.findConnectedPipelines, data)
+ },
+ findPipelineByClickPoint (data) {
+ return axios.get(mapUrl.findPipelineByClickPoint, data)
+ },
+ findFlowDirection (data) {
+ return axios.get(mapUrl.findFlowDirection, data)
+ },
+ findLeakages (data) {
+ return axios.get(mapUrl.findLeakages, data)
+ },
+ getCrossSection (data) {
+ return axios.get(mapUrl.getCrossSection, data)
}
}
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index e34d1ad..9bcd01f 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -5,17 +5,20 @@
export const GetUser = $HOST + '/user/getUser'
+// 鍥哄簾
export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
export const getSolidWasteDetail = $HOST + '/wasteSolid/getSolidWasteDetail'
export const getSolidWasteSurveyDetail = $HOST + '/wasteSolid/getSolidWasteSurveyDetail'
+// 搴熸皵
export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
export const DataItems = $HOST + '/wasteGas/RTDB/DataItems' // 搴熸皵瀹炴椂鏁版嵁
export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
+// 搴熸按
export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails' // 搴熸按鐩戞祴鏁版嵁鏄庣粏琛�
@@ -23,4 +26,13 @@
export const getQueryLabMonData = $HOST + '/wasteWater/QueryLabMonData' // 浜哄伐鏁版嵁
export const getDataItems = $HOST + '/wasteWater/RTDB/DataItems' // 瀹炴椂鏁版嵁
+// 鍏徃
export const getCompany = $HOST + '/company/getCompany'
+
+// 绠＄嚎鍒嗘瀽
+// export const findPipelineByClickPoint = $HOST + '/findPipelineByClickPoint'
+export const findPipelineByClickPoint = 'http://xearth.cn:6202' + '/findPipelineByClickPoint'
+export const findConnectedPipelines = 'http://xearth.cn:6202' + '/findConnectedPipelines'
+export const findFlowDirection = 'http://xearth.cn:6202' + '/findFlowDirection'
+export const findLeakages = 'http://xearth.cn:6202' + '/findLeakages'
+export const getCrossSection = 'http://xearth.cn:6202' + '/getCrossSection'
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index edb9f1c..ded7868 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -678,9 +678,9 @@
margin: 15px 0;
}
-.fixed-table {
- background: rgba(0, 16, 30, 1) !important;
-}
+//.fixed-table {
+// background: rgba(0, 16, 30, 1) !important;
+//}
/****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/
.el-tabs__nav-wrap::after {
@@ -787,4 +787,4 @@
.el-icon-time:before {
content: " ";
}
-}
\ No newline at end of file
+}
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index 4c50dcb..f81ddbf 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -1,56 +1,37 @@
-<!-- 鏃ユ暟鎹� -->
<template>
- <div id="Tab">
- <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <div class="form-echrts">
- <div class="from-search">
- <div class="pickerMon">
- <div class="pickerData">
- <span> 寮�濮嬫椂闂�:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
- </span>
- </div>
- <div class="pickerData">
- <span>缁撴潫鏃堕棿:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
- </span>
- </div>
- </div>
- <!-- <div>-->
- <!-- 閲囨牱鐐规暟:-->
- <!-- <el-select v-model="formInline.region" placeholder="50">-->
- <!-- <el-option label="0" value="0"></el-option>-->
- <!-- <el-option label="25" value="25"></el-option>-->
- <!-- <el-option label="50" value="50"></el-option>-->
- <!-- <el-option label="75" value="75"></el-option>-->
- <!-- <el-option label="100" value="100"></el-option>-->
- <!-- </el-select>-->
- <!-- </div>-->
- <div class="detailbtn hover-bottom">鏌ヨ</div>
- <div class="detailbtn hover-bottom">鏄庣粏琛�</div>
- </div>
- <div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegasday">
- </div>
+ <div class="echarts-box">
+ <div class="tab-scroll">
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <span class="time-select">{{ formData.timeStart }}鏃モ�攞{ formData.timeEnd }}鏃�</span>
</div>
- <!-- <!– 鏄庣粏寮规 –>-->
- <!-- <el-dialog :visible.sync="dialogVisible"-->
- <!-- :append-to-body="true"-->
- <!-- :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
- <!-- width="68%"-->
- <!-- center-->
- <!-- v-dialogDrag-->
- <!-- >-->
- <!-- <div class="el-dialog-div" style="height: 500px">-->
- <!-- <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
- <!-- </div>-->
- <!-- </el-dialog>-->
+ <div class="echarts-form">
+ <span class="demonstration">寮�濮嬫椂闂达細</span>
+ <el-date-picker
+ v-model="formData.timeStart"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime">
+ </el-date-picker>
+ <span class="demonstration">缁撴潫鏃堕棿锛�</span>
+ <el-date-picker
+ v-model="formData.timeEnd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime">
+ </el-date-picker>
+ <span class="demonstration">閲囨牱鐐规暟锛�</span>
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
+ </el-select>
+ <el-button>鏌ヨ</el-button>
+ <el-button>鏄庣粏琛�</el-button>
+ </div>
+ <div class="echarts-chart">
+ <div style="width:5rem;height:1.5rem;" ref="wastegasday"></div>
+ </div>
</div>
</template>
<script>
-// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+
import PublicDataStandard from '../PublicDataStandard'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
@@ -59,7 +40,6 @@
export default {
name: 'DayData',
components: {
- // PublicDetailedList
PublicDataStandard
},
data () {
@@ -106,9 +86,11 @@
val: null
}
}],
- formInline: {
- timeStart: null,
- timeEnd: null
+ formData: {
+ region: '25',
+ regionList: [25, 50, 75, 100],
+ timeStart: dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+ timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss')
},
dataType: 1,
myChart: null,
@@ -126,14 +108,11 @@
},
methods: {
async initnData () {
- // 鐢ㄤ簬鎺ュ彛鏁版嵁璇锋眰鐨勫弬鏁� 寮�濮�/缁撴潫鏃堕棿 || 鍙�夋嫨鏌ヨ鐨勫紑濮�/缁撴潫鏃堕棿
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss')
const data = {
onLineMonEmissPointId: 23,
monItemId: 28,
- beginTime: this.formInline.timeStart,
- endTime: this.formInline.timeEnd,
+ beginTime: this.formData.timeStart,
+ endTime: this.formData.timeEnd,
dataType: this.dataType
}
const result = (await mapApi.getWasteGasMonData(data)).Result.DataInfo
@@ -493,7 +472,7 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '5%'
+ left: '15%'
// containLabel: true
},
legend: { // 鍥句緥
@@ -618,107 +597,4 @@
</script>
<style scoped lang="less">
-
-.animation {
- .infomation {
- padding: 0.02rem 0.04rem;
-
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 0.04rem;
- padding: 0 0.04rem
- }
- }
-}
-
-.form-echrts {
- width: 100%;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .from-search {
- display: flex;
- padding: 0.02rem;
-
- > div {
- margin-left: 10px
- }
-
- .pickerMon {
- display: flex;
-
- > div:first-child {
- margin-right: 10px;
- }
-
- .pickerData {
- flex: 1;
- display: flex;
-
- > span {
- line-height: 22px
- }
-
- .pickerTable {
- margin-left: 3px;
- }
- }
- }
-
- /deep/ .el-date-editor--datetime {
- width: 100%;
- }
-
- /deep/ .el-input__inner {
- position: relative;
- width: 1rem;
- background-color: #2e4967;
- color: #fff;
- font-size: 0.08rem;
- height: 0.15rem;
- padding: 0;
- border: none;
- text-align: center;
- z-index: 9999;
- //padding-left:20px ;
- //padding: 0!important;
- }
-
- /deep/ .el-input__icon {
- display: block;
- width: 1rem;
- height: 0.15rem;
- line-height: 0.15rem;
- cursor: pointer;
- font-size: 0;
- }
-
- input::-webkit-calendar-picker-indicator {
- opacity: 100;
- }
-
- .detailbtn {
- background-color: #2e4967;
- text-align: center;
- padding: 0 7px;
- height: 0.15rem;
- line-height: 0.15rem;
- border-radius: 4px;
- margin-right: 6px;
- }
- }
-
- .el-dialog-div {
- overflow: auto;
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- }
-}
</style>
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 170357c..520590d 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -1,27 +1,31 @@
-<!-- 灏忔椂鏁版嵁 -->
<template>
- <div id="Tab">
- <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <div class="form-echrts">
- <div class="from-search">
- <div class="pickerMon">
- <div class="pickerData">
- <span> 寮�濮嬫椂闂�:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
- </span>
- </div>
- <div class="pickerData">
- <span>缁撴潫鏃堕棿:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
- </span>
- </div>
- </div>
- <div class="detailbtn">鏌ヨ</div>
- <div class="detailbtn" @click="ScheduleShow">鏄庣粏琛�</div>
- </div>
- <div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegashour"></div>
+ <div class="echarts-box">
+ <div class="tab-scroll">
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <span class="time-select">{{ formData.timeStart }}鏃垛�攞{ formData.timeEnd }}鏃�</span>
+ </div>
+ <div class="echarts-form">
+ <span class="demonstration">寮�濮嬫椂闂达細</span>
+ <el-date-picker
+ v-model="formData.timeStart"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime">
+ </el-date-picker>
+ <span class="demonstration">缁撴潫鏃堕棿锛�</span>
+ <el-date-picker
+ v-model="formData.timeEnd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime">
+ </el-date-picker>
+ <span class="demonstration">閲囨牱鐐规暟锛�</span>
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
+ </el-select>
+ <el-button @click="querySearch">鏌ヨ</el-button>
+ <el-button @click="ScheduleShow">鏄庣粏琛�</el-button>
+ </div>
+ <div class="echarts-chart">
+ <div style="width:5rem;height:1.5rem;" ref="wastegashour"></div>
</div>
<!-- 鏄庣粏寮规-->
<el-dialog :visible.sync="showSchedule"
@@ -36,10 +40,10 @@
</template>
<script>
-// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import Scheduleof from '@components/BaseNav/WasteGas/Scheduleof'
import PublicDataStandard from '../PublicDataStandard'
+import 'dayjs/locale/es'
import dayjs from 'dayjs'
import mapApi from '@/api/mapApi'
@@ -94,9 +98,11 @@
val: null
}
}],
- formInline: {
- timeStart: null,
- timeEnd: null
+ formData: {
+ region: '25',
+ regionList: [25, 50, 75, 100],
+ timeStart: dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+ timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss')
},
showSchedule: false,
dataType: 2,
@@ -115,15 +121,15 @@
ScheduleShow () {
this.showSchedule = !this.showSchedule
},
+ querySearch () {
+ console.log('鏌ヨ')
+ },
async initnData () {
- // 鐢ㄤ簬鎺ュ彛鏁版嵁璇锋眰鐨勫弬鏁� 寮�濮�/缁撴潫鏃堕棿 || 鍙�夋嫨鏌ヨ鐨勫紑濮�/缁撴潫鏃堕棿
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss')
const data = {
onLineMonEmissPointId: 23,
monItemId: 28,
- beginTime: this.formInline.timeStart,
- endTime: this.formInline.timeEnd,
+ beginTime: this.formData.timeStart,
+ endTime: this.formData.timeEnd,
dataType: this.dataType
}
const result = (await mapApi.getWasteGasMonData(data)).Result.DataInfo
@@ -530,7 +536,7 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '5%'
+ left: '15%'
// containLabel: true
},
legend: { // 鍥句緥
@@ -655,106 +661,4 @@
</script>
<style scoped lang="less">
-.animation {
- .infomation {
- padding: 0.02rem 0.04rem;
-
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 0.04rem;
- padding: 0 0.04rem
- }
- }
-}
-
-.form-echrts {
- width: 100%;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .from-search {
- display: flex;
- padding: 0.02rem;
-
- > div {
- margin-left: 10px
- }
-
- .pickerMon {
- display: flex;
-
- > div:first-child {
- margin-right: 10px;
- }
-
- .pickerData {
- flex: 1;
- display: flex;
-
- > span {
- line-height: 22px
- }
-
- .pickerTable {
- margin-left: 3px;
- }
- }
- }
-
- /deep/ .el-date-editor--datetime {
- width: 100%;
- }
-
- /deep/ .el-input__inner {
- position: relative;
- width: 1rem;
- background-color: #2e4967;
- color: #fff;
- font-size: 0.08rem;
- height: 0.15rem;
- padding: 0;
- border: none;
- z-index: 9999;
- text-align: center;
- //padding-left:20px ;
- //padding: 0!important;
- }
-
- /deep/ .el-input__icon {
- display: block;
- width: 1rem;
- height: 0.15rem;
- line-height: 0.15rem;
- cursor: pointer;
- font-size: 0;
- }
-
- input::-webkit-calendar-picker-indicator {
- opacity: 100;
- }
-
- .detailbtn {
- background-color: #2e4967;
- text-align: center;
- padding: 0 7px;
- height: 0.15rem;
- line-height: 0.15rem;
- border-radius: 4px;
- margin-right: 6px;
- }
- }
-
- .el-dialog-div {
- overflow: auto;
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- }
-}
</style>
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index cca3068..d4f0d28 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -2,7 +2,7 @@
<div class="left-top-toolbox-panel">
<div class="specific-tools">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
- <div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse" >
+ <div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse">
<i class="icon iconfont icongongju"></i>
</div>
</el-tooltip>
@@ -15,10 +15,12 @@
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
v-model="isShow[index]">
- <el-button slot="reference" class="el-button" :class="active === index? 'tools-panel-choose':''" @click.native="changeChoose(index)">
+ <el-button slot="reference" class="el-button" :class="active === index? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
<i :class="'icon iconfont '+item.icon"></i>
</el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)" v-show="item.index!=='2'" :class="indexT==toolActive?'hover':''" >
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
+ v-show="item.index!=='2'" :class="indexT==toolActive?'hover':''">
<i :class="'icon iconfont '+itemT.icon"></i>
</el-button>
<lc-base-map v-show="item.index==='2'"></lc-base-map>
@@ -421,14 +423,15 @@
<style lang="less" scoped>
- .tools-panel-content .el-button .zongs{
- transform:rotate(90deg);
- -ms-transform:rotate(90deg);
- -moz-transform:rotate(90deg);
- -webkit-transform:rotate(90deg);
- -o-transform:rotate(90deg);
- display: block;
- }
+.tools-panel-content .el-button .zongs {
+ transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ -moz-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ -o-transform: rotate(90deg);
+ display: block;
+}
+
.animationChange-enter-active, .animationChange-leave-active {
transition: all 0.5s;
}
@@ -447,17 +450,19 @@
.specific-tools {
display: flex;
overflow: hidden;
- .el-button {
+
+ .el-button {
z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
- color:#00fff6;
+ color: #00fff6;
background: @background-color;
- border: 0.00521rem solid #00fff6;
+ border: 0.00521rem solid #00fff6;
vertical-align: middle !important;
- font-size: 20px;
+ font-size: 20px;
+
.base-map-img {
position: absolute;
}
@@ -465,21 +470,25 @@
.base-map-img:hover {
cursor: pointer;
}
+
img {
width: 22px;
height: 22px;
}
+
.span-default {
display: block;
font-size: 10px;
}
+
span {
display: block;
font-size: 10px;
}
}
- .specific-tools-group .el-button{
- span{
+
+ .specific-tools-group .el-button {
+ span {
color: #0B89B5;
}
}
@@ -489,7 +498,7 @@
z-index: 999;
padding: 0;
margin: 0;
- margin-right:0.015rem;
+ margin-right: 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
background: @background-color;
@@ -507,7 +516,8 @@
.tools-panel-choose {
border: 0.00521rem solid #fff700;
box-shadow: 0 0 0.03rem #fff700;
- color:#fff700;
+ color: #fff700;
+
img {
width: 22px;
height: 22px;
@@ -527,16 +537,18 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- background:@background-color4;
- color:@color-tool;
- border:1px solid @color-tool;
+ background: @background-color4;
+ color: @color-tool;
+ border: 1px solid @color-tool;
}
- .special-button:hover{
+
+ .special-button:hover {
color: #00fff6;
}
}
}
}
+
.base-map-inner-panel {
display: flex;
justify-content: center;
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 4b3d479..7a9b7a5 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -1,386 +1,392 @@
<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="linkClear" 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
- ref="singleTable"
- highlight-current-row
- :data="tableDataLinkStart"
- @row-click="linkSelectStart"
- max-height="200"
- style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- label="缁堢偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- class-name="fixed-table"
- fixed="right"
- 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
- max-height="200"
- highlight-current-row
- :data="tableDataLinkEnd"
- @row-click="linkSelectEnd"
- style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- 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;">{{ currentLinkIsTrue }}</span></span>
- <el-table
- highlight-current-row
- max-height="200"
- :data="tableDataLinkResult"
- @row-click="linkResultSelect"
- style="width: 100%" size="mini">
+ <!-- <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="linkClear" 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
+ ref="singleTable"
+ highlight-current-row
+ :data="tableDataLinkStart"
+ @row-click="linkSelectStart"
+ max-height="200"
+ style="width: 100%" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ label="缁堢偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
+ 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
+ max-height="200"
+ highlight-current-row
+ :data="tableDataLinkEnd"
+ @row-click="linkSelectEnd"
+ style="width: 100%" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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;">{{ currentLinkIsTrue }}</span></span>
+ <el-table
+ highlight-current-row
+ max-height="200"
+ :data="tableDataLinkResult"
+ @row-click="linkResultSelect"
+ style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- 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-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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>
- </el-tab-pane>
- <el-tab-pane label="鐖嗙" name="second" style="color: #cccccc">鐖嗙锛堢浉鍏冲紑鍏筹級
- <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-card shadow="hover">
- <span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
- <el-table
- ref="singleTable"
- highlight-current-row
- :data="bgPipeLine"
- style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- 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
- highlight-current-row
- :data="bgFm"
- @row-click="bgFmClick"
- style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- label="缁堢偣缂栧彿"
- >
- </el-table-column>
+ </el-table>
+ <!-- </el-card>-->
+ <!-- </el-scrollbar>-->
+ </el-tab-pane>
+ <el-tab-pane label="鐖嗙" name="second" style="color: #cccccc">
+ <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
+ ref="singleTable"
+ highlight-current-row
+ :data="bgPipeLine"
+ style="width: 100%" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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
+ highlight-current-row
+ :data="bgFm"
+ @row-click="bgFmClick"
+ style="width: 100%" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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>
- <el-tab-pane label="娴佸悜" name="third">
- <el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;"
- title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭绾�">
- 閫夋嫨绠℃
- </el-button>
- <el-table
- :data="tableDataLiuxiang" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- width="100"
- prop="endpointnu"
- 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>鍒嗘瀽缁撴灉</span>
- <el-table
- highlight-current-row
- max-height="200"
- :data="lxTableDataResult"
- @row-click="lxResultSelect"
- style="width: 100%" size="mini">
+ <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>
+ <el-tab-pane label="娴佸悜" name="third">
+ <el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;"
+ title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭绾�">
+ 閫夋嫨绠℃
+ </el-button>
+ <el-table
+ :data="tableDataLiuxiang" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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
+ highlight-current-row
+ max-height="200"
+ :data="lxTableDataResult"
+ @row-click="lxResultSelect"
+ style="width: 100%" size="mini">
- <el-table-column
- prop="lineloopna"
- label="绠＄嚎绫诲瀷"
- >
- </el-table-column>
- <el-table-column
- sortable
- prop="pipecode"
- label="绠＄嚎鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- sortable
- prop="startpoint"
- label="璧风偣缂栧彿"
- >
- </el-table-column>
- <el-table-column
- sortable
- prop="endpointnu"
- 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-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ width="100"
+ sortable
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ 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-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">
- <div slot="header" class="fixed-style">
- <span>绠＄嚎鏌ヨ缁撴灉</span>
- </div>
- <el-table
- :data="tableData"
- style="width: 100%" @row-click="selectRow" size="mini">
- <el-table-column
- prop="name"
- label="绠＄嚎鍚嶇О"
- width="180">
- </el-table-column>
- <el-table-column
- prop="type"
- 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>
- </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: 600px;height:300px;"></div>
- </el-card>
- </el-tab-pane>
- </el-tabs>
- </el-card>
- </transition>
+ </el-table>
+ </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">-->
+ <div slot="header" class="fixed-style">
+ <span>绠＄嚎鏌ヨ缁撴灉</span>
+ </div>
+ <el-table
+ :data="tableData"
+ style="width: 100%" @row-click="selectRow" size="mini">
+ <el-table-column
+ prop="name"
+ label="绠＄嚎鍚嶇О"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="type"
+ 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>
+ <!-- </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: 600px;height:300px;"></div>
+ </el-card>
+ </el-tab-pane>
+ </el-tabs>
+ <!-- </el-card>-->
+ <!-- </transition>-->
</div>
</template>
@@ -453,7 +459,7 @@
methods: {
// tab鍒囨崲
handleClick (tab, event) {
- console.log(tab, event)
+ // console.log(tab, event)
this.clearLinkPipe()
this.clearLX()
this.linkClear()
@@ -475,15 +481,56 @@
selectClick (e) {
window.map.off('click', this.selectClick)
const point = [e.latlng.lng, e.latlng.lat]
- console.log(point)
this.getPipeLine(point)
},
+ // 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁
+ async getPipeLine (point) {
+ const param = {
+ x: point[0],
+ y: point[1],
+ radius: 3
+ }
+ // 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
+ const res = await mapApi.findPipelineByClickPoint(param)
+ if (this.activeName === 'first') {
+ if (this.linkType) {
+ this.tableDataLinkStart = res.data
+ } else {
+ this.tableDataLinkEnd = res.data
+ }
+ } else if (this.activeName === 'second') {
+ this.bgPipeLine = res.data
+ } else if (this.activeName === 'third') {
+ this.tableDataLiuxiang = res.data
+ } else if (this.activeName === 'fourth') {
- // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃
- linkClickStart () {
+ }
+ console.log(res)
+ },
+
+ // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e
+ linkClickStart (e) {
+ console.log(e)
console.log('鍦板浘鐐瑰嚮璧峰绠℃')
this.linkType = 1
this.selectPipeLine()
+ },
+ // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
+ linkSelectStart (e) {
+ console.log('閫夋嫨璧峰绠℃')
+ this.$refs.singleTable.setCurrentRow(e)
+ this.currentSelectStart = e
+ if (this.currentSelectStartLine != null) {
+ this.currentSelectStartLine.remove()
+ this.currentSelectStartLine = null
+ }
+ const geom = JSON.parse(e.geomText)
+ this.currentSelectStartLine = window.L.geoJSON(geom, {
+ style: function (feature) {
+ return { color: 'rgba(0,255,0,.6)' }
+ }
+ }).addTo(this.map)
+ this.map.panInsideBounds(this.currentSelectStartLine.getBounds())
},
// 杩為�氭�� ===> 鍦板浘鐐瑰嚮缁撴潫绠℃
linkClickEnd () {
@@ -491,66 +538,29 @@
this.linkType = 0
this.selectPipeLine()
},
- // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
- linkSelectStart (e) {
- console.log('閫夋嫨璧峰绠℃')
- console.log(e)
- // this.$refs.singleTable.setCurrentRow(e)
- // this.currentSelectStart = e
- // if (this.currentSelectStartLine != null) {
- // this.currentSelectStartLine.remove()
- // this.currentSelectStartLine = null
- // }
- // const geom = JSON.parse(e.geomText)
- // this.currentSelectStartLine = L.geoJSON(geom, {
- // style: function (feature) {
- // return { color: 'rgba(0,255,0,.6)' }
- // }
- // }).addTo(this.map)
- // this.map.panInsideBounds(this.currentSelectStartLine.getBounds())
- },
// 杩為�氭�� 缁撴潫绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠�
linkSelectEnd (e) {
console.log('閫夋嫨缁撴潫绠℃')
console.log(e)
- // this.currentSelectEnd = e
- //
- // if (this.currentSelectEndLine != null) {
- // this.currentSelectEndLine.remove()
- // this.currentSelectEndLine = null
- // }
- //
- // const geom = JSON.parse(e.geomText)
- // this.currentSelectEndLine = L.geoJSON(geom, {
- // style: function (feature) {
- // return { color: 'rgba(200,0,200,.6)' }
- // }
- // }).addTo(this.map)
- // this.map.panInsideBounds(this.currentSelectEndLine.getBounds())
- },
- // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢
- linkResultSelect (e) {
- console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
- console.log(e)
+ this.currentSelectEnd = 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())
+ // 鍋氬垽鏂璻emove
+ if (this.currentSelectEndLine != null) {
+ this.currentSelectEndLine.remove()
+ this.currentSelectEndLine = null
+ }
+
+ const geom = JSON.parse(e.geomText)
+ this.currentSelectEndLine = window.L.geoJSON(geom, {
+ style: function (feature) {
+ return { color: 'rgba(200,0,200,.6)' }
+ }
+ }).addTo(this.map)
+ this.map.panInsideBounds(this.currentSelectEndLine.getBounds())
},
// 杩為�氭�ф煡璇�
async linkQuery () {
- // 璁剧疆鍒嗘瀽缁撴灉涓虹┖
+ // 姣忔鏌ヨ鍒嗘瀽缁撴灉涓虹┖
this.tableDataLinkResult = []
if (this.linkPipeline.length > 1) {
this.linkPipeline.forEach((itm) => {
@@ -568,8 +578,10 @@
startLineID: this.currentSelectStart.id,
endLineID: this.currentSelectEnd.id
}
+ console.log(param)
// 璇锋眰鎺ュ彛鍜屾暟鎹�
const res = await mapApi.findConnectedPipelines(param)
+ console.log(res)
// 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁
if (res.data.length === 0) {
this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃')
@@ -597,14 +609,34 @@
// color: '#ffff00'
// }
// }
- // const line = main.createFlowLine(param1)
- // const createFlowLine = (param) => {
- // let flowLine = L.polyline(param.points, param.option)
- // flowLine.addTo(map)
- // return flowLine
- // }
- // this.linkPipeline.push(line)
+ // const line = main.createFlowLine(param1)
+ // const createFlowLine = (param) => {
+ // const flowLine = window.L.polyline(param.points, param.option)
+ // flowLine.addTo(window.map)
+ // return flowLine
+ // }
+ // this.linkPipeline.push(line)
// })
+ },
+ // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢
+ linkResultSelect (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())
},
// 杩為�氭�х殑娓呴櫎鍔熻兘
linkClear () {
@@ -769,36 +801,6 @@
this.flowPipeLine = null
}
},
-
- // 娴佸悜鏁版嵁璇锋眰
- async getPipeLine (point) {
- // const param = {
- // x: point[0],
- // y: point[1],
- // radius: 3
- // }
- // console.log(param)
-
- // 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
- // const res = await api.getPipeline(param)
- // 3 娴佸悜
-
- // if (this.activeName === 'first') {
- // if (this.linkType) {
- // this.tableDataLinkStart = res.data
- // } else {
- // this.tableDataLinkEnd = res.data
- // }
- // } else if (this.activeName === 'second') {
- // this.bgPipeLine = res.data
- // } else if (this.activeName === 'third') {
- // this.tableDataLiuxiang = res.data
- // } else if (this.activeName === 'fourth') {
- //
- // }
- //
- // console.log(res)
- },
// 娴佸悜-绠＄嚎閫夋嫨
selectRowLiuXiang (e) {
// 閫夋嫨瑕佹樉绀虹殑娴佸悜绾�
@@ -946,10 +948,12 @@
}
/deep/ .el-card {
- margin-top: 15px;
- background: rgba(0, 16, 30, 0.5);
+ //width: 95%;
+ //margin: 5px auto;
+ //border: none;
+ //background: rgba(0, 16, 30, 0.5);
//border: 0.00521rem solid @color;
- box-shadow: 0 0 0.03rem @color;
+ //box-shadow: 0 0 0.03rem @color;
}
/deep/ .el-card__body {
@@ -957,11 +961,20 @@
}
/deep/ .fixed-style {
+ font-size: 12px;
display: inline-block;
color: #ffffff;
margin: 15px;
}
+/deep/ th.is-leaf {
+ border: none !important;
+}
+
+/deep/ .el-table__fixed-right::before, .el-table__fixed::before {
+ background: none;
+}
+
/deep/ .fixed-table {
background: rgba(0, 16, 30, 1) !important;
}
--
Gitblit v1.8.0