From c803e406172652e17ca874ad6dc077ba1cd7cf4a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 18:35:30 +0800
Subject: [PATCH] 弹窗显示

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8756e92..e0df2bb 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,9 +7,10 @@
     <div class="public-bounced-content">
       <div class="public-bounced-content-left">
         <GasTab :displayContent="displayContent"></GasTab>
-        <!--                <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
-        <PublicTable></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>
       </div>
       <div class="public-bounced-content-right">
         <GasVideo></GasVideo>
@@ -23,15 +24,16 @@
 import '@/components/BaseNav/SolidWaste/directive/dir'
 import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
 import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+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',
   components: {
     GasTab,
     PublicTable,
-    // GasECharts,
+    GasECharts,
     GasVideo
   },
   data () {
@@ -41,11 +43,19 @@
     }
   },
   methods: {
-    setData (data) {
+    setData (data, value) {
+      console.log(data)
+      console.log(value)
       this.displayContent = data
       this.flag = true
-      // this.value = value
+      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