From 3c93d885a3bc6a84079cc347bb30888d5fb98f11 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index cbf0693..8ecaaa4 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>
@@ -53,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 () {
@@ -72,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
@@ -99,7 +109,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 45%;
+ top: 15%;
left: 20%;
.public-bounced-title {
--
Gitblit v1.8.0