From 04ed9679adccde76c00bb9648124326de54719d6 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 17:29:34 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 9 +
src/components/LayerController/logic/WasteGas.js | 2
src/components/panel/topicSearch/pipeChangesSearch.vue | 157 +++++++++++++++++
src/components/panel/topicSearch/pipeInformationSearch.vue | 139 +++++++++++++++
src/conf/Topic.js | 14 +
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 23 +
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 60 ++++--
src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue | 29 ++
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 66 ++-----
src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue | 3
src/components/BaseNav/PublicBounced/PublicBounced.vue | 5
11 files changed, 418 insertions(+), 89 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 63f6a30..a17c565 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -3,10 +3,10 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
</div>
</div>
<div class="form-echrts">
@@ -25,16 +25,16 @@
</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>-->
+<!-- 閲囨牱鐐规暟:-->
+<!-- <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" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
@@ -138,6 +138,10 @@
datatype: 1
}
}
+ },
+ mounted () {
+ this.onSubmit()
+ // this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
methods: {
onSubmit () {
@@ -667,40 +671,6 @@
// }
// return options
// }
- },
- mounted () {
- // this.$nextTick(() => {
- // this.drawChart()
- // const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonDateData)).reverse()
- // console.log(dataWatch)
- // var dateDate = []
- // // {COD:[3,4,5]}
- // var data = {}
- // for (var n = 0; n < dataWatch.length; n++) {
- // var d = dataWatch[n].MonTimeStr.substring(5, 9)
- // if (dateDate.indexOf(d) < 0) {
- // dateDate.push(d)
- // }
- // if (data[dataWatch[n].PoltmtrlName]) {
- // data[dataWatch[n].PoltmtrlName].push(dataWatch[n].MonQty)
- // } else {
- // data[dataWatch[n].PoltmtrlName] = [dataWatch[n].MonQty]
- // }
- // }
- // var series = []
- // for (var k in data) {
- // series.push({
- // name: k,
- // type: 'line',
- // yAxisIndex: k === '搴熸按娴侀噺' ? 1 : 0,
- // data: data[k]
- // })
- // }
- // console.log(series)
- // const opitons = this.initOptions(dateDate, series)
- // this.mychartDay = this.$echarts.init(this.$refs.main)
- // this.mychartDay.setOption(opitons)
- // })
}
}
</script>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index ce8f4e9..f8a7ec3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -3,10 +3,10 @@
<div id="Tab">
<div class="infomation">
<div>
- <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
</div>
</div>
<div class="form-echrts">
@@ -30,16 +30,16 @@
</span>
</div>
</div>
- <div>
- 閲囨牱鐐规暟:
- <el-select v-model="formInline.region">
- <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>-->
+<!-- 閲囨牱鐐规暟:-->
+<!-- <el-select v-model="formInline.region">-->
+<!-- <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" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
@@ -141,18 +141,31 @@
}
}
},
- // mounted () {
- // // this.$nextTick(() => {
- // // console.log(1)
- // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
- // // }
- // },
+ created () {
+ // this.$nextTick(() => {
+ // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
+ // }
+ },
+ mounted () {
+ this.onSubmit()
+ // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
+ },
methods: {
onSubmit () {
- console.log(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
- this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
+ this.CreateChart()
+ // console.log(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
+ // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
},
- CreateChart: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+ CreateChart: function () {
+ // var id = this.JsonCtarts.id
+ // var title = this.JsonCtarts.title
+ var legend = this.JsonCtarts.legend
+ var xdata = this.JsonCtarts.xdata
+ var ydatas = this.JsonCtarts.ydatas
+ var yname = this.JsonCtarts.yname
+ // var jcdId = this.JsonCtarts.jcdID
+ var datatype = this.JsonCtarts.datatype
+
this.myChart = this.$echarts.init(this.$refs.main)
this.myChart.clear()
var dataUnit = ''
@@ -450,6 +463,7 @@
}],
series: serLists
}
+ console.log(option)
this.myChart.setOption(option)
/*
this.myChart.on('legendselectchanged', function (params) {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
index 3a14a98..495445a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
@@ -587,6 +587,9 @@
border-radius: 2px;
margin-right: 10px;
padding:0 10px
+ //>i{
+ // color: #f00;
+ // }
}
.infomation {
padding: 5px 10px;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
index feb9840..4a92d45 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
@@ -2,10 +2,10 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
</div>
</div>
<div class="form-echrts">
@@ -14,7 +14,7 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
</span>
</div>
<div class="pickerData">
@@ -205,10 +205,20 @@
}
}
},
- // mounted () {
- // this.DrawEXHRealTimeDateChart()
- // },
+ mounted () {
+ // const Day = new Date()
+ // console.log(Day)
+ this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ },
methods: {
+ // EndTime () {
+ // var myDate = new Date()
+ // var mytime = myDate.toLocaleTimeString() // 鑾峰彇褰撳墠鏃堕棿
+ // console.log(mytime)
+ // },
+ // handleshowcomplaint(row) {
+ // this.temp.complaint_consultationtime = new Date()
+ // },
onSubmit () {
this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
},
@@ -490,6 +500,9 @@
border-radius: 2px;
margin-right: 10px;
padding:0 10px
+ >i{
+ color: #ffffff;
+ }
}
.animation {
//width: 600px;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 584f1db..fdb0659 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,10 +5,14 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
+<!-- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>-->
+<!-- <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>-->
+<!-- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>-->
+<!-- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>-->
+ <li :class="active==0?'hover':''" @click='tabTaggle("ECharts",0)'>瀹炴椂鏁版嵁</li>
+ <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
+ <li :class="active==2?'hover':''" @click='tabTaggle("EChartsDate",2)'>鏃ユ暟鎹�</li>
+ <li :class="active==3?'hover':''" @click='tabTaggle("EChartsTable",3)'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -18,7 +22,7 @@
<span >瓒呮爣</span>
<i style=" background: orange;"></i>
</div>
- <component :is="currentTab" v-bind="$attrs"></component>
+ <component :is="currentTab" v-bind="$attrs" ref="Echatrs"></component>
</div>
</template>
@@ -40,14 +44,19 @@
EChartsHourWasteWater,
EChartsTable
},
+ mounted () {
+ this.$refs.Echatrs.CreateChart()
+ },
data () {
return {
- currentTab: 'EChartsHour'
+ currentTab: 'EChartsHour',
+ active: '1'
}
},
methods: {
- tabTaggle (taggleMenu) {
+ tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
+ this.active = num
// debugger
}
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8ecaaa4..d635356 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -63,7 +63,7 @@
mounted () {
// this.$nextTick(() => {
// console.log(this.$refs.publicBounced)
- // console.log(this.$refs.PublicChart)
+ console.log(this.$refs.PublicChart)
// })
},
methods: {
@@ -82,11 +82,12 @@
this.value = value
},
setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(this.$refs)
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
this.ManualData = ManualData
- console.log(this.getQueryOnlineMonData)
+ // console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 9b85faf..bc7369b 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -82,10 +82,10 @@
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
this.setPanTo(e.latlng, 80)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 446cb33..ebd4277 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -57,6 +57,9 @@
import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch'
import SewersSearch from '@components/panel/topicSearch/SewersSearch'
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
+import PipeChangesSearch from '@components/panel/topicSearch/pipeChangesSearch.vue'
+import PipeInformationSearch from '@components/panel/topicSearch/pipeInformationSearch.vue'
+
import bus from '@/eventBus'
export default {
@@ -143,6 +146,12 @@
case '绠＄嚎':
this.gcComp = SewersSearch
break
+ case '绠￠亾鍙樻洿':
+ this.gcComp = PipeChangesSearch
+ break
+ case '绠￠亾淇℃伅':
+ this.gcComp = PipeInformationSearch
+ break
}
},
handlePage (page) {
diff --git a/src/components/panel/topicSearch/pipeChangesSearch.vue b/src/components/panel/topicSearch/pipeChangesSearch.vue
new file mode 100644
index 0000000..dbd4bee
--- /dev/null
+++ b/src/components/panel/topicSearch/pipeChangesSearch.vue
@@ -0,0 +1,157 @@
+<template>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{title}}</div>
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="绠＄嚎绫诲瀷锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in areaTypeOptions" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍙樻洿骞翠唤锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in areaTypeOptions1" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍙樻洿绫诲瀷锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in areaTypeOptions2" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-scrollbar style="height:416.44px">
+ <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>绠＄嚎鍚嶇О1 <button style="float:right">闄勫睘璁炬柦</button></h3>
+ <p>绠＄嚎闀垮害锛�<span>751绫�</span></p>
+ <p>鎶曡繍骞撮檺锛�<span style="display: inline-block;margin-right: 10px">5骞�</span> 浠嬭川锛�<span>鐢熸椿姹℃按</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>绠＄嚎鍚嶇О1</h3>
+ <p>绠＄嚎闀垮害锛�<span>751绫�</span></p>
+ <p>鎶曡繍骞撮檺锛�<span style="display: inline-block;margin-right: 10px">5骞�</span> 浠嬭川锛�<span>鐢熸椿姹℃按</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ :current-page=current
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
+ </div>
+ <!-- <div class="monitor2" v-if="hbVisible">-->
+ <!-- <env-protect-search></env-protect-search>-->
+ <!-- </div>-->
+ <!-- <div class="monitor2" v-if="pkVisible">-->
+ <!-- <discharge-search></discharge-search>-->
+ <!-- </div>-->
+</template>
+
+<script>
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
+export default {
+ name: 'DischargeSearch',
+ data () {
+ return {
+ gdVisible: true,
+ list: [],
+ labelList: PipelineTypeOptions[0].labelList,
+ total: 0,
+ form: {
+ areaVal: '',
+ type: ''
+ },
+ // pageSize: 10,
+ // current: 1,
+ isWaybillHover: true,
+ isRouteHover: false,
+ areaTypeOptions: [
+ { label: '鐢熸椿姹℃按绠＄嚎', value: '1' },
+ { label: '鍚洂绠＄嚎', value: '2' },
+ { label: '闆ㄦ按绠＄嚎', value: '3' },
+ { label: '鍚补绠＄嚎', value: '4' },
+ { label: '浜嬫晠姘寸绾�', value: '5' },
+ { label: '鍚⒈绠＄嚎', value: '6' },
+ { label: '寰幆姘寸绾�', value: '7' },
+ { label: '鍑�鍖栨按绠＄嚎', value: '8' }
+ ],
+ areaTypeOptions1: [
+ { label: '2016', value: '1' },
+ { label: '2017', value: '2' },
+ { label: '2018', value: '3' },
+ { label: '2019', value: '4' },
+ { label: '2020', value: '5' },
+ { label: '2016', value: '6' }
+ ],
+ areaTypeOptions2: [
+ { label: '鍏ㄩ儴', value: '1' },
+ { label: '鍦ㄧ敤', value: '2' },
+ { label: '鍋滅敤', value: '3' },
+ { label: '搴熷純', value: '4' },
+ { label: '鎷嗛櫎', value: '5' },
+ { label: '鍏朵粬', value: '6' }
+ ]
+ }
+ },
+ props: ['title'],
+ methods: {
+ // 鍖哄煙绛涢��
+ areaType (val) {
+ this.pipelineTypeOptions.forEach((itm) => {
+ if (val === itm.value) {
+
+ }
+ })
+ },
+ async handleSearch () {
+ const param = {
+ pipelineType: this.form.pipelineType,
+ dataType: this.form.dataType
+ }
+ console.log(param)
+ var wfsHelper = new WfsHelper()
+ wfsHelper.addTypeName(this.form.query.layerName)
+ wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // const _this = this
+ const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+ this.list = res.data.features
+ }
+ },
+ handleLocation (val) {
+ console.log(val)
+ const bound = this.L.geoJSON([val], {}).getBounds()
+ var layer = window.serviceLayerHelper.getByLayerId(val.id)
+ layer && layer.openPopup()
+ this.$store.state.map.map.flyToBounds(bound)
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/components/panel/topicSearch/pipeInformationSearch.vue b/src/components/panel/topicSearch/pipeInformationSearch.vue
new file mode 100644
index 0000000..916f4d2
--- /dev/null
+++ b/src/components/panel/topicSearch/pipeInformationSearch.vue
@@ -0,0 +1,139 @@
+<template>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{title}}</div>
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in areaTypeOptions" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="绠＄嚎淇℃伅锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in areaTypeOptions1" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-scrollbar style="height:416.44px">
+ <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>绠＄嚎鍚嶇О1 <button style="float:right">闄勫睘璁炬柦</button></h3>
+ <p>绠＄嚎闀垮害锛�<span>751绫�</span></p>
+ <p>鎶曡繍骞撮檺锛�<span style="display: inline-block;margin-right: 10px">5骞�</span> 浠嬭川锛�<span>鐢熸椿姹℃按</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>绠＄嚎鍚嶇О1</h3>
+ <p>绠＄嚎闀垮害锛�<span>751绫�</span></p>
+ <p>鎶曡繍骞撮檺锛�<span style="display: inline-block;margin-right: 10px">5骞�</span> 浠嬭川锛�<span>鐢熸椿姹℃按</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ :current-page=current
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
+ </div>
+ <!-- <div class="monitor2" v-if="hbVisible">-->
+ <!-- <env-protect-search></env-protect-search>-->
+ <!-- </div>-->
+ <!-- <div class="monitor2" v-if="pkVisible">-->
+ <!-- <discharge-search></discharge-search>-->
+ <!-- </div>-->
+</template>
+
+<script>
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
+export default {
+ name: 'DischargeSearch',
+ data () {
+ return {
+ gdVisible: true,
+ list: [],
+ labelList: PipelineTypeOptions[0].labelList,
+ total: 0,
+ form: {
+ areaVal: '',
+ type: ''
+ },
+ // pageSize: 10,
+ // current: 1,
+ isWaybillHover: true,
+ isRouteHover: false,
+ areaTypeOptions: [
+ { label: '绠＄嚎鏈綋', value: '1' }, { label: '闄勫睘璁炬柦', value: '2' }, { label: '鐜繚璁炬柦', value: '3' }
+ ],
+ areaTypeOptions1: [
+ { label: '鍏ㄩ儴绠＄嚎', value: '1' },
+ { label: '鐢熸椿姹℃按绠＄嚎', value: '1' },
+ { label: '鍚洂绠＄嚎', value: '1' },
+ { label: '闆ㄦ按绠＄嚎', value: '1' },
+ { label: '鍚补绠＄嚎', value: '1' },
+ { label: '浜嬫晠姘寸绾�', value: '1' },
+ { label: '鍚⒈绠＄嚎', value: '1' },
+ { label: '寰幆姘寸绾�', value: '1' },
+ { label: '鍑�鍖栨按绠＄嚎', value: '1' }
+ ]
+ }
+ },
+ props: ['title'],
+ methods: {
+ // 鍖哄煙绛涢��
+ areaType (val) {
+ this.pipelineTypeOptions.forEach((itm) => {
+ if (val === itm.value) {
+
+ }
+ })
+ },
+ async handleSearch () {
+ const param = {
+ pipelineType: this.form.pipelineType,
+ dataType: this.form.dataType
+ }
+ console.log(param)
+ var wfsHelper = new WfsHelper()
+ wfsHelper.addTypeName(this.form.query.layerName)
+ wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // const _this = this
+ const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+ this.list = res.data.features
+ }
+ },
+ handleLocation (val) {
+ console.log(val)
+ const bound = this.L.geoJSON([val], {}).getBounds()
+ var layer = window.serviceLayerHelper.getByLayerId(val.id)
+ layer && layer.openPopup()
+ this.$store.state.map.map.flyToBounds(bound)
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index bcf296e..7162c42 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -60,4 +60,18 @@
isShow: true,
icon: '/assets/images/menu/special.png',
comp: ''
+}, {
+ name: '绠￠亾鍙樻洿',
+ id: 8,
+ checked: false,
+ isShow: true,
+ icon: '/assets/images/menu/special.png',
+ comp: ''
+}, {
+ name: '绠￠亾淇℃伅',
+ id: 9,
+ checked: false,
+ isShow: true,
+ icon: '/assets/images/menu/special.png',
+ comp: ''
}]
--
Gitblit v1.8.0