From bed3a5fd547a75988f99c24c0a43d29db29d2d49 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 10:48:27 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

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

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4d7da9e..5a43649 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,19 +1,26 @@
 <template>
-  <div class="public-bounced" v-draw v-if="flag">
+  <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 class="public-bounced-content">
       <div class="public-bounced-content-left">
-        <GasTab :displayContentTab="displayContentTab"></GasTab>
+        <public-tabs :displayContentTab="displayContentTab" :value="value"
+                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
         <div class="public-bounced-content-left-bottom">
-          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
-          <GasECharts v-else></GasECharts>
+          <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">
-        <GasVideo></GasVideo>
+        <public-video></public-video>
       </div>
     </div>
   </div>
@@ -21,32 +28,44 @@
 
 <script>
 
+// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+
 import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
 import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-// import GasTabs from './GasComponents/GasTabs'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
 
 export default {
   name: 'PublicBounced',
   components: {
-    GasTab,
+    // Echarts,
+    PublicTabs,
     PublicTable,
-    GasECharts,
-    GasVideo
+    PublicChart,
+    PublicVideo
   },
   data () {
     return {
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
       displayContentTitle: '',
       displayContentTab: '',
       displayContentTable: '',
-      flag: false
+      flag: false,
+      value: '',
+      getWasteGasDetails: [],
+      getWasteWaterMonitoringDetails: [],
+      getQueryOnlineMonData: []
     }
   },
   methods: {
+    closePopup () {
+      this.flag = false
+    },
     setData (dataBasic, dataDetailed, value) {
-      console.log(dataDetailed)
+      this.flag = true
+      this.value = value
       dataBasic.forEach(item => {
         this.displayContentTitle = item.StoragePlaceName
       })
@@ -55,8 +74,23 @@
       this.flag = true
       this.value = value
     },
-    closePopup () {
-      this.flag = false
+    setGasData (data, dataDetails, value) {
+      this.setWasteGasdata = data
+      this.getWasteGasDetails = dataDetails
+      // console.log(dataDetails)
+      this.displayContentTitle = data.Name
+      this.flag = true
+      this.value = value
+    },
+    setWaterData (dataWater, dataDetail, hourData, 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
     }
   }
 }
@@ -64,20 +98,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;
@@ -89,26 +123,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