From 3e8003d111e8535ffdb1a1188fe4ca9c2ca8e18f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 16:35:33 +0800
Subject: [PATCH] 弹框窗口大小问题修改

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index acee023..d39f737 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,21 +1,49 @@
 <template>
-  <div class="public-bounced" v-draw v-if="flag">
+  <div class="public-bounced" v-drag 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>
+        <public-tabs :displayContentTab="displayContentTab" :value="value"
+                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
         <div class="public-bounced-content-left-bottom">
-          <PublicTable v-if="value === 'gufei'"></PublicTable>
-          <PublicChart v-else></PublicChart>
+          <public-table v-if="value === 'gufei'"
+                        :displayContentTable="displayContentTable"></public-table>
+          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+                        :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
         </div>
       </div>
       <div class="public-bounced-content-right">
-        <PublicVideo></PublicVideo>
+        <public-video></public-video>
       </div>
     </div>
+<!--    <el-dialog-->
+<!--        :visible.sync="flag"-->
+<!--        width="70%"-->
+<!--        v-drag-->
+<!--        :modal="false">-->
+<!--      <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">-->
+<!--          <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"-->
+<!--                          :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="public-bounced-content-right">-->
+<!--          <public-video></public-video>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
@@ -37,14 +65,25 @@
   },
   data () {
     return {
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
       displayContentTitle: '',
       displayContentTab: '',
       displayContentTable: '',
-      flag: false
+      flag: false,
+      value: '',
+      getWasteGasDetails: [],
+      getWasteWaterMonitoringDetails: [],
+      getWasteWaterMonitoring: []
     }
   },
   methods: {
+    closePopup () {
+      this.flag = false
+    },
     setData (dataBasic, dataDetailed, value) {
+      this.flag = true
+      this.value = value
       dataBasic.forEach(item => {
         this.displayContentTitle = item.StoragePlaceName
       })
@@ -53,14 +92,23 @@
       this.flag = true
       this.value = value
     },
-    setGasData (data, value) {
+    setGasData (data, dataDetails, value) {
+      this.setWasteGasdata = data
+      this.getWasteGasDetails = dataDetails
+      // console.log(dataDetails)
       this.displayContentTitle = data.Name
-      this.displayContentTab = data
       this.flag = true
       this.value = value
     },
-    closePopup () {
-      this.flag = false
+    setWaterData (dataWater, dataDetail, drawData, value) {
+      this.setWasteWaterdata = dataWater
+      // console.log(data)
+      this.getWasteWaterMonitoring = drawData
+      console.log(drawData)
+      this.getWasteWaterMonitoringDetails = dataDetail
+      this.displayContentTitle = dataWater.Name
+      this.flag = true
+      this.value = value
     }
   }
 }
@@ -69,6 +117,8 @@
 <style lang="less" scoped>
 .public-bounced {
   width: 75%;
+  //height: 520px;
+  height: 40%;
   z-index: 999;
   position: absolute;
   bottom: 5%;
@@ -93,11 +143,12 @@
       color: white;
       margin: 0 15px;
       font-size: 22px;
+      cursor: pointer;
     }
   }
 
   .public-bounced-content {
-    margin: 15px auto;
+    margin: 15px 0;
     display: flex;
     //align-items: center;
     justify-content: space-around;

--
Gitblit v1.8.0