From d0391dba3708d3f32bcd94e1881d1b598a0d9ef0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:21:10 +0800
Subject: [PATCH] 修改图表问题

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

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 584a661..eb88010 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,13 +1,12 @@
 <template>
-  <div class="public-bounced" v-drag v-if="flag">
-    <!--    <Echarts></Echarts>-->
-    <div class="public-bounced-title">
+  <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'"
@@ -16,11 +15,13 @@
                         :value="value"
                         :getQueryOnlineMonData="getQueryOnlineMonData"
                         :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
->
+                        :ManualData="ManualData"
+                        ref="PublicChart"
+          >
           </public-chart>
         </div>
       </div>
-      <div class="public-bounced-content-right">
+      <div class="public-bounced-content-right" >
         <public-video></public-video>
       </div>
     </div>
@@ -29,18 +30,15 @@
 
 <script>
 
-// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
-
-import '@/components/BaseNav/SolidWaste/directive/dir'
-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 '@/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'
 
 export default {
   name: 'PublicBounced',
   components: {
-    // Echarts,
     PublicTabs,
     PublicTable,
     PublicChart,
@@ -48,49 +46,50 @@
   },
   data () {
     return {
-      setWasteGasdata: '',
-      setWasteWaterdata: '',
       displayContentTitle: '',
       displayContentTab: '',
       displayContentTable: '',
       flag: false,
       value: '',
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
-      getQueryOnlineMonData: []
-      // getGasQueryOnlineMonData: []
+      getQueryOnlineMonData: [],
+      ManualData: []
     }
+  },
+  destoryed () {
+    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
   },
   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, value) {
+    setGasData (data, dataDetails, GasHourData, ManualData, value) {
+      // console.log(data, dataDetails, GasHourData, ManualData, value)
       this.setWasteGasdata = data
+      this.displayContentTitle = data.Name
       this.getWasteGasDetails = dataDetails
       this.getQueryOnlineMonData = GasHourData
-      // console.log(dataDetails)
-      this.displayContentTitle = data.Name
+      this.ManualData = ManualData
+      // console.log(this.getQueryOnlineMonData)
       this.flag = true
       this.value = value
     },
-    setWaterData (dataWater, dataDetail, hourData, 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
@@ -101,16 +100,14 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  z-index: 999;
+  z-index: 2000;
   position: absolute;
-  top: 15%;
+  top: 35%;
   left: 20%;
-  background-color: #002432;
-  border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
+    cursor: move;
     height: 0.1rem;
-    border: 1px #a4c0d8 solid;
     padding: 10px 0;
     display: flex;
     align-items: center;
@@ -123,11 +120,15 @@
     }
 
     i {
-      color: white;
+      color: #C0C4CC;
       margin: 0 15px;
       font-size: 22px;
       cursor: pointer;
     }
+
+    i:hover {
+      color: #00fff6;
+    }
   }
 
   .public-bounced-content {

--
Gitblit v1.8.0