From 83d2044b6b47d26ff77ec25de8d6787ceaf83e3a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 17:00:39 +0800
Subject: [PATCH] 1

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index f0b58c2..c0b4e4f 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="public-bounced" v-draw v-show="flag">
+  <div class="public-bounced" v-draw v-if="flag">
     <div class="public-bounced-title">
       <span>{{ displayContent.Name }}</span>
       <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,8 +7,15 @@
     <div class="public-bounced-content">
       <div class="public-bounced-content-left">
         <GasTab :displayContent="displayContent"></GasTab>
-        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
-        <GasECharts v-else></GasECharts>
+        <div class="public-bounced-content-left-bottom">
+          <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+          <GasECharts v-else></GasECharts>
+        </div>
+<!--        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+        <GasECharts></GasECharts>
+<!--        <GasTabs></GasTabs>-->
+        <!--        <PublicTable></PublicTable>-->
+<!--                <GasECharts></GasECharts>-->
       </div>
       <div class="public-bounced-content-right">
         <GasVideo></GasVideo>
@@ -24,6 +31,7 @@
 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'
 
 export default {
   name: 'PublicBounced',
@@ -41,10 +49,18 @@
   },
   methods: {
     setData (data, value) {
+      console.log(data)
+      console.log(value)
       this.displayContent = data
       this.flag = true
       this.value = value
+      console.log(this.flag)
     },
+    // setData (data) {
+    //   this.displayContent = data
+    //   this.flag = true
+    //   // this.value = value
+    // },
     closePopup () {
       this.flag = false
     }

--
Gitblit v1.8.0