From 200d3045c0c285c7916d58589e3b810979da7f16 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 14:57:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8d23b01..8ecaaa4 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced map-background" v-drag v-if="flag">
+ <div class="public-bounced map-background" v-drag v-show="flag">
<div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -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,14 +55,16 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
},
mounted () {
- this.$nextTick(() => {
- console.log(this.$refs.publicBounced)
- })
+ // this.$nextTick(() => {
+ // console.log(this.$refs.publicBounced)
+ // console.log(this.$refs.PublicChart)
+ // })
},
methods: {
closePopup () {
@@ -78,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
--
Gitblit v1.8.0