From 0e4ef4b4e9f68acee331cf31e96b4c2c3c7a968d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 30 三月 2021 17:41:07 +0800
Subject: [PATCH] 弹窗中折线统计图基本布局

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

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 850980d..2307d3f 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,9 @@
     </div>
     <div class="public-bounced-content">
       <div class="public-bounced-content-left">
-        <GasTable :displayContent="displayContent"></GasTable>
-        <GasECharts></GasECharts>
-<!--        <GasTabs></GasTabs>-->
+        <GasTab :displayContent="displayContent"></GasTab>
+        <PublicTable v-if="value === 'gufei'"></PublicTable>
+        <GasECharts v-else></GasECharts>
       </div>
       <div class="public-bounced-content-right">
         <GasVideo></GasVideo>
@@ -20,16 +20,16 @@
 <script>
 
 import '@/components/BaseNav/SolidWaste/directive'
-import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+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 GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
 
 export default {
   name: 'PublicBounced',
   components: {
-    // GasTabs,
-    GasTable,
+    GasTab,
+    PublicTable,
     GasECharts,
     GasVideo
   },
@@ -40,9 +40,10 @@
     }
   },
   methods: {
-    setData (data) {
+    setData (data, value) {
       this.displayContent = data
       this.flag = true
+      this.value = value
     },
     closePopup () {
       this.flag = false
@@ -54,11 +55,10 @@
 <style lang="less" scoped>
 .public-bounced {
   z-index: 999;
-  position: fixed;
+  position: absolute;
   top: 50%;
   left: 50%;
   background-color: #002432;
-  margin: 1% auto;
   border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
@@ -87,12 +87,10 @@
     justify-content: space-around;
 
     .public-bounced-content-left {
-
     }
 
     .public-bounced-content-right {
     }
   }
-
 }
 </style>

--
Gitblit v1.8.0