From 8bb5942235c86ea771c4215a77c46b1245c30a93 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:31:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   97 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index acee023..9d03215 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,25 +1,34 @@
 <template>
-  <div class="public-bounced" v-draw v-if="flag">
-    <div class="public-bounced-title">
-      <span>{{ displayContentTitle }}</span>
-      <i class="el-icon-circle-close" @click="closePopup"></i>
-    </div>
-    <div class="public-bounced-content">
-      <div class="public-bounced-content-left">
-        <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
-        <div class="public-bounced-content-left-bottom">
-          <PublicTable v-if="value === 'gufei'"></PublicTable>
-          <PublicChart v-else></PublicChart>
+  <div class="public-bounced" v-drag v-if="flag">
+<!--    <Echarts></Echarts>-->
+        <div class="public-bounced-title">
+          <span>{{ displayContentTitle }}</span>
+          <i class="el-icon-circle-close" @click="closePopup"></i>
         </div>
-      </div>
-      <div class="public-bounced-content-right">
-        <PublicVideo></PublicVideo>
-      </div>
-    </div>
+        <div class="public-bounced-content">
+          <div class="public-bounced-content-left">
+            <public-tabs :displayContentTab="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">
+              </public-chart>
+            </div>
+          </div>
+          <div class="public-bounced-content-right">
+            <public-video></public-video>
+          </div>
+        </div>
   </div>
 </template>
 
 <script>
+
+// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
 
 import '@/components/BaseNav/SolidWaste/directive/dir'
 import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
@@ -30,6 +39,7 @@
 export default {
   name: 'PublicBounced',
   components: {
+    // Echarts
     PublicTabs,
     PublicTable,
     PublicChart,
@@ -37,14 +47,26 @@
   },
   data () {
     return {
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
       displayContentTitle: '',
       displayContentTab: '',
       displayContentTable: '',
-      flag: false
+      flag: false,
+      value: '',
+      getWasteGasDetails: [],
+      getWasteWaterMonitoringDetails: [],
+      getQueryOnlineMonData: []
+      // getGasQueryOnlineMonData: []
     }
   },
   methods: {
+    closePopup () {
+      this.flag = false
+    },
     setData (dataBasic, dataDetailed, value) {
+      this.flag = true
+      this.value = value
       dataBasic.forEach(item => {
         this.displayContentTitle = item.StoragePlaceName
       })
@@ -53,14 +75,24 @@
       this.flag = true
       this.value = value
     },
-    setGasData (data, value) {
+    setGasData (data, dataDetails, GasHourData, value) {
+      this.setWasteGasdata = data
+      this.getWasteGasDetails = dataDetails
+      this.getQueryOnlineMonData = GasHourData
+      console.log(this.getQueryOnlineMonData)
       this.displayContentTitle = data.Name
-      this.displayContentTab = data
       this.flag = true
       this.value = value
     },
-    closePopup () {
-      this.flag = false
+    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+      this.setWasteWaterdata = dataWater
+      // console.log(data)
+      this.getQueryOnlineMonData = hourData
+      // console.log(drawData)
+      this.getWasteWaterMonitoringDetails = dataDetail
+      this.displayContentTitle = dataWater.Name
+      this.flag = true
+      this.value = value
     }
   }
 }
@@ -68,20 +100,20 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  width: 75%;
   z-index: 999;
   position: absolute;
-  bottom: 5%;
-  left: 15%;
+  top: 15%;
+  left: 20%;
   background-color: #002432;
   border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
+    height: 0.1rem;
     border: 1px #a4c0d8 solid;
+    padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 5px 0;
 
     span {
       color: #f4f7ff;
@@ -93,26 +125,23 @@
       color: white;
       margin: 0 15px;
       font-size: 22px;
+      cursor: pointer;
     }
   }
 
   .public-bounced-content {
-    margin: 15px auto;
+    padding: 0.1rem;
     display: flex;
     //align-items: center;
-    justify-content: space-around;
-    padding: 10px;
+    //justify-content: space-around;
 
     .public-bounced-content-left {
-      flex: 3;
-      height: 100%;
-      margin-right: 10px;
+      //width: 4.8rem;
     }
 
     .public-bounced-content-right {
-      flex: 2;
-      //width: 48%;
-      height: 100%;
+      //width: 3rem;
+      margin-left: 0.1rem;
     }
   }
 }

--
Gitblit v1.8.0