From c310aa8e462fbadd85df50546bfcbb46bb0d5216 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 13:50:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 501d120..1aaf67c 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,15 +6,16 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value"
- :setWasteGasdata="setWasteGasdata"></PublicTabs>
+ <public-tabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
- <PublicChart :getWasteGasDetails="getWasteGasDetails" v-else></PublicChart>
+ <public-table v-if="value === 'gufei'"
+ :displayContentTable="displayContentTable"></public-table>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
- <PublicVideo></PublicVideo>
+ <public-video></public-video>
</div>
</div>
</div>
@@ -39,16 +40,21 @@
data () {
return {
setWasteGasdata: '',
+ setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
- getWasteGasDetails: []
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getWasteWaterMonitoring: []
}
},
methods: {
setData (dataBasic, dataDetailed, value) {
+ this.flag = true
+ this.value = value
dataBasic.forEach(item => {
this.displayContentTitle = item.StoragePlaceName
})
@@ -65,6 +71,16 @@
this.flag = true
this.value = value
},
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getWasteWaterMonitoring = drawData
+ console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
--
Gitblit v1.8.0