From 69a2d142442e1e42f8325139f16b70cf3cede924 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:40:54 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   49 ++++++++++++++++++++-----------------------------
 1 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index b31bc24..e3c7080 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,12 +1,12 @@
 <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>
     </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'"
@@ -21,7 +21,7 @@
           </public-chart>
         </div>
       </div>
-      <div class="public-bounced-content-right">
+      <div class="public-bounced-content-right" >
         <public-video></public-video>
       </div>
     </div>
@@ -31,15 +31,14 @@
 <script>
 
 import '@/utils/dragBoxes'
-import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
 
 export default {
   name: 'PublicBounced',
   components: {
-    // Echarts,
     PublicTabs,
     PublicTable,
     PublicChart,
@@ -47,57 +46,49 @@
   },
   data () {
     return {
-      setWasteGasdata: '',
-      setWasteWaterdata: '',
       displayContentTitle: '',
       displayContentTab: '',
       displayContentTable: '',
       flag: false,
       value: '',
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
       getQueryOnlineMonData: [],
       ManualData: []
-      // getGasQueryOnlineMonData: []
     }
   },
-  mounted () {
-    // this.$nextTick(() => {
-    // console.log(this.$refs.publicBounced)
-    // console.log(this.$refs.PublicChart)
-    // })
+  beforeUpdate () {
+    this.$refs.PublicChart.$refs.Echats.CreateChart()
   },
   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)
       this.setWasteGasdata = data
       this.getWasteGasDetails = dataDetails
       this.getQueryOnlineMonData = GasHourData
       this.ManualData = ManualData
-      console.log(this.getQueryOnlineMonData)
+      // console.log(this.getQueryOnlineMonData)
       this.displayContentTitle = data.Name
       this.flag = true
       this.value = value
     },
-    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+    setWaterData (dataWater, detailData, hourData, dateData, value) {
       this.setWasteWaterdata = dataWater
-      // console.log(data)
       this.getQueryOnlineMonData = hourData
-      // console.log(drawData)
-      this.getWasteWaterMonitoringDetails = dataDetail
+      this.getWasteWaterMonitoringDetails = detailData
       this.displayContentTitle = dataWater.Name
       this.flag = true
       this.value = value

--
Gitblit v1.8.0