From dc109551277dd40494a03a84e8a0bb8b9073e38c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 14:11:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 18a3f0d..cea3744 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,6 +15,8 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
>
</public-chart>
</div>
@@ -37,7 +39,6 @@
export default {
name: 'PublicBounced',
components: {
- // Echarts,
PublicTabs,
PublicTable,
PublicChart,
@@ -54,9 +55,16 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
+ },
+ mounted () {
+ // this.$nextTick(() => {
+ // console.log(this.$refs.publicBounced)
+ // console.log(this.$refs.PublicChart)
+ // })
},
methods: {
closePopup () {
@@ -73,10 +81,11 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
@@ -100,7 +109,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 45%;
+ top: 15%;
left: 20%;
.public-bounced-title {
--
Gitblit v1.8.0