From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   77 ++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ce04e0a..0db423e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -4,45 +4,49 @@
       <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 :setSolidWaste="displayContentTab" :value="value"
-                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
-        <div class="public-bounced-content-left-bottom">
-          <public-table v-if="value === 'gufei'"
-                        :displayContentTable="displayContentTable"></public-table>
-          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
-                        :value="value"
-                        :getQueryOnlineMonData="getQueryOnlineMonData"
-                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
-                        :ManualData="ManualData"
-                        ref="PublicChart"
-          >
-          </public-chart>
-        </div>
-      </div>
-      <div class="public-bounced-content-right" >
-        <public-video></public-video>
-      </div>
-    </div>
+<!--    <div class="public-bounced-content">-->
+<!--      <div class="public-bounced-content-left">-->
+<!--        <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'"-->
+<!--                        :displayContentTable="displayContentTable"></public-table>-->
+<!--          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
+<!--                        :value="value"-->
+<!--                        :getQueryOnlineMonData="getQueryOnlineMonData"-->
+<!--                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
+<!--                        :ManualData="ManualData"-->
+<!--                        ref="PublicChart"-->
+<!--          >-->
+<!--          </public-chart>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="public-bounced-content-right">-->
+<!--        <public-video></public-video>-->
+<!--      </div>-->
+<!--    </div>-->
+    <PublicSector></PublicSector>
   </div>
 </template>
 
 <script>
 
 import '@/utils/dragBoxes'
-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'
+// 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'
+
+import PublicSector from '@components/BaseNav/PublicSector'
 
 export default {
   name: 'PublicBounced',
   components: {
-    PublicTabs,
-    PublicTable,
-    PublicChart,
-    PublicVideo
+    PublicSector
+    // PublicTabs,
+    // PublicTable,
+    // PublicChart,
+    // PublicVideo
   },
   data () {
     return {
@@ -60,7 +64,8 @@
     }
   },
   destoryed () {
-    this.$refs.PublicChart.$refs.Echats.CreateChart()
+    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
   },
   methods: {
     closePopup () {
@@ -75,22 +80,20 @@
       this.displayContentTable = dataDetailed[0]
     },
     setGasData (data, dataDetails, GasHourData, ManualData, value) {
-      // console.log(this.$refs)
+      // console.log(data, dataDetails, GasHourData, ManualData, value)
       this.setWasteGasdata = data
+      this.displayContentTitle = data.Name
       this.getWasteGasDetails = dataDetails
       this.getQueryOnlineMonData = GasHourData
       this.ManualData = ManualData
       // 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
@@ -103,7 +106,7 @@
 .public-bounced {
   z-index: 2000;
   position: absolute;
-  top: 15%;
+  top: 35%;
   left: 20%;
 
   .public-bounced-title {

--
Gitblit v1.8.0