From 2b814076d8a1ba1ec21227aa30cf549db4587aa4 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 14:10:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 32 ++------
src/components/panel/topicSearch/SewersSearch.vue | 26 +++--
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 81 ++++----------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 25 ++----
src/components/panel/topicSearch/SolidWasteSearch.vue | 52 +++++++------
src/components/LayerController/logic/SolidWaste.js | 5 +
6 files changed, 79 insertions(+), 142 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 9fca234..db3efff 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,7 +6,7 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <public-tabs :displayContentTab="displayContentTab" :value="value"
+ <public-tabs :setSolidWaste="displayContentTab" :value="value"
:setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
<div class="public-bounced-content-left-bottom">
<public-table v-if="value === 'gufei'"
@@ -46,13 +46,13 @@
},
data () {
return {
- setWasteGasdata: '',
- setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
getQueryOnlineMonData: [],
@@ -60,26 +60,17 @@
// getGasQueryOnlineMonData: []
}
},
- mounted () {
- // this.$nextTick(() => {
- // console.log(this.$refs.publicBounced)
- console.log(this.$refs.PublicChart)
- // })
- },
methods: {
closePopup () {
this.flag = false
},
- setData (dataBasic, dataDetailed, value) {
+ // 鍥哄簾鐩稿叧淇℃伅璁剧疆
+ setData (title, dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
- dataBasic.forEach(item => {
- this.displayContentTitle = item.StoragePlaceName
- })
- this.displayContentTab = dataBasic
- this.displayContentTable = dataDetailed
- this.flag = true
- this.value = value
+ this.displayContentTitle = title
+ this.displayContentTab = dataBasic[0]
+ this.displayContentTable = dataDetailed[0]
},
setGasData (data, dataDetails, GasHourData, ManualData, value) {
// console.log(this.$refs)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTable.vue b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
index 65558af..86b2218 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
@@ -1,17 +1,10 @@
<template>
- <div class="win">
- <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <div class="main">
- <div class="main-table">
- <el-table :data="listData" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
- :label="item.label"></el-table-column>
- </el-table>
- </div>
+ <div class="react">
+ <div class="main-table">
+ <el-table :data="displayContentTable" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label"></el-table-column>
+ </el-table>
</div>
</div>
</template>
@@ -55,13 +48,6 @@
]
}
},
- mounted () {
- this.$nextTick(() => {
- this.displayContentTable.forEach(item => {
- this.listData = item
- })
- })
- },
methods: {
tableRowClassName ({
row,
@@ -79,52 +65,17 @@
</script>
<style lang="less" scoped>
-
-.win {
+.react {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
-}
-
-.main {
- .main-table {
- width: 100%;
- }
-}
-
-.border_corner {
- z-index: 999;
- position: absolute;
- width: 14px;
- height: 14px;
- background: rgba(0, 0, 0, 0);
- border: 1px solid #47d5ea;
-}
-
-.border_corner_left_top {
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
-}
-
-.border_corner_right_top {
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
-}
-
-.border_corner_left_bottom {
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
-}
-
-.border_corner_right_bottom {
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
+ background: linear-gradient(to left, #02a6b5, #02a6b5) left top no-repeat,
+ linear-gradient(to bottom, #02a6b5, #02a6b5) left top no-repeat,
+ linear-gradient(to left, #02a6b5, #02a6b5) right top no-repeat,
+ linear-gradient(to bottom, #02a6b5, #02a6b5) right top no-repeat,
+ linear-gradient(to left, #02a6b5, #02a6b5) left bottom no-repeat,
+ linear-gradient(to bottom, #02a6b5, #02a6b5) left bottom no-repeat,
+ linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat,
+ linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat;
+ background-size: 2px 20px, 20px 2px, 2px 20px, 20px 2px;
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
index 314cb97..a01b178 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
@@ -18,14 +18,14 @@
<li>鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</li>
</ul>
</div>
- <div v-else-if="value === 'gufei'">
+ <div v-if="value === 'gufei'">
<ul>
- <li>鍦烘墍鍚嶇О:{{ tabData.StoragePlaceName }}</li>
- <li>璐瓨鑳藉姏:{{ tabData.StorageQty }}(鍚�)</li>
- <li>鍓╀綑璐瓨鑳藉姏:{{ tabData.SurplusFloorArea }}(鍚�)</li>
- <li>鍗犲湴闈㈢Н(銕�):{{ tabData.DesignFloorArea }}(銕�)</li>
- <li>鏈�杩戣串瀛樻棩鏈�:{{ tabData.StorageDate }}</li>
- <li></li>
+ <li>鍦烘墍鍚嶇О:{{ setSolidWaste.StoragePlaceName }}</li>
+ <li>璐瓨鑳藉姏:{{ setSolidWaste.StorageQty }}(鍚�)</li>
+ <li>鍓╀綑璐瓨鑳藉姏:{{ setSolidWaste.SurplusFloorArea }}(鍚�)</li>
+ <li>鍗犲湴闈㈢Н(銕�):{{ setSolidWaste.DesignFloorArea }}(銕�)</li>
+ <li>鏈�杩戣串瀛樻棩鏈�:{{ setSolidWaste.StorageDate }}</li>
+ <li class="lastli"></li>
</ul>
</div>
<div v-else-if="value === 'feishui'">
@@ -46,23 +46,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
- data () {
- return {
- tabData: []
- }
- },
- mounted () {
- this.processingData()
- },
- methods: {
- processingData () {
- for (var i = 0; i < this.displayContentTab.length; i++) {
- // console.log(this.displayContentTab[i])
- this.tabData = this.displayContentTab[i]
- }
- }
- }
+ props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata']
}
</script>
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 29f074a..141ef5b 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -75,6 +75,9 @@
const dataValue = {
StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
}
+ // console.log(e.layer.options.totransferData.Name)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
// 鍩烘湰淇℃伅 tabs
const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
// 璇︾粏淇℃伅灞曠ず table
@@ -86,7 +89,7 @@
document.body.appendChild(instance.$el)
// document.body.removeChild(instance.$el)
// 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
- instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+ instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 200)
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 8d0b517..f32abb2 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,22 +6,24 @@
<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.pipelineType" @change="handlePipelineType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
<el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.dataType" :popper-class="'select-down'">
+ <!-- @change="handleDataType"-->
<el-option
- v-for="item in subItems"
- :key="item.code"
- :label="item.name"
- :value="item.name">
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -78,7 +80,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-// 寮曞叆鍒嗘瀽缁勪欢鍐呭
+// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
@@ -128,11 +130,13 @@
wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
}
},
handleLocation (val) {
+ console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
// var layer = window.layerFactory.flyByLayerId(val.id, bound)
window.map.flyToBounds(bound)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index ea1c17d..676551d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="judgeVisible">
- <div class="panel-title">{{title}}</div>
+ <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 v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
@@ -15,27 +15,24 @@
</el-option>
</el-select>
</el-form-item>
- <!-- <div class="search-radio">
- <el-radio v-model="radio" label="1">鍏ㄩ儴</el-radio>
- <el-radio v-model="radio" label="2">姝ｅ父</el-radio>
- <el-radio v-model="radio" label="3">棰勮</el-radio>
- </div> -->
<el-radio-group v-model="form.type" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
+ <span class="levelOfRisk-type">{{ item.name }}</span>
+ </el-radio>
</el-radio-group>
-
<div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <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:286.22px">
- <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
+ <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
+ @click="setBounced(item)">
<i class="state"></i>
<div>
<h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
@@ -52,11 +49,6 @@
props: ['title'],
data () {
return {
- levelOfRisk: [
- { name: '鍏ㄩ儴', value: '1' },
- { name: '姝ｅ父', value: '2' },
- { name: '棰勮', value: '3' }
- ],
judgeVisible: true,
solidWasteTypeOptions: [{
value: '1',
@@ -123,7 +115,20 @@
key: 'length'
}]
}],
- radio: '1',
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: '1'
+ },
+ {
+ name: '姝ｅ父',
+ value: '2'
+ },
+ {
+ name: '棰勮',
+ value: '3'
+ }
+ ],
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
@@ -134,14 +139,13 @@
}
},
methods: {
+ setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ },
handlePipelineType (val) {
- // console.log(val)
this.solidWasteTypeOptions.forEach(item => {
- // console.log(item.value)
if (val === item.value) {
- // console.log('鏁版嵁閫夋嫨鐩稿悓')
- // 鎺ユ敹鏁版嵁 鐢ㄤ簬涔嬪悗鎺ュ彛鏁版嵁鐨勮皟鐢�
- // this.form.transferData = item.value
this.handleSearch(item.value)
}
})
@@ -149,8 +153,8 @@
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
// console.log(this.form.keyword)
- const result = await mapApi.getSolidWasteSurveyDetail(data)
- // console.log(result)
+ const result = await mapApi.getSolidWaste(data)
+ console.log(result)
this.searchDataDisplay = result.Result.DataInfo
}
}
--
Gitblit v1.8.0