From 22e5d744b28c0df0f115476b44a75d1d46cac228 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 17:36:12 +0800
Subject: [PATCH] echarts数据显示功能完善

---
 src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index b346f75..a93a90c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -4,13 +4,18 @@
         <div class="border_corner border_corner_right_top"></div>
         <div class="border_corner border_corner_left_bottom"></div>
         <div class="border_corner border_corner_right_bottom"></div>
-        <ul class="tab">
-            <li :class="active==0?'hover':''" @click='tabTaggle("ECharts",0)'>瀹炴椂鏁版嵁</li>
-            <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
-            <li :class="active==2?'hover':''" @click='tabTaggle("EChartsHourWasteWater",2)'>鏃ユ暟鎹�</li>
-            <li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>浜哄伐鏁版嵁</li>
+        <ul class="tab" v-if="this.$attrs.value === 'feiqi'">
+            <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+            <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+            <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
+            <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
         </ul>
-        <component :is="currentTab"></component>
+        <ul class="tab" v-else>
+            <li @click='tabTaggle("EChartsRealWasteWater")'>瀹炴椂鏁版嵁</li>
+            <li @click='tabTaggle("EChartsHourWasteWater")'>灏忔椂鏁版嵁</li>
+            <li @click='tabTaggle("EChartsDateWasteWater")'>鏃ユ暟鎹�</li>
+            <li @click='tabTaggle("EChartsWasteWaterTable")'>浜哄伐鏁版嵁</li>
+        </ul>
         <div class="legend" >
             <span >姝e父</span>
             <i style=" background: #4ec99c;"></i>
@@ -19,33 +24,41 @@
             <span >瓒呮爣</span>
             <i style=" background: orange;"></i>
         </div>
+        <component :is="currentTab" v-bind="$attrs"></component>
     </div>
 </template>
 
 <script>
+import ECharts from './Echarts'
 import EChartsHour from './EChartsHour'
-// import EChartsDate from './EChartsDate'
+import EChartsDate from './EChartsDate'
+import EChartsTable from './EChartsTable'
+
+import EChartsRealWasteWater from './EChartsRealWasteWater'
 import EChartsHourWasteWater from './EChartsHourWasteWater'
 import EChartsDateWasteWater from './EChartsDateWasteWater'
+import EChartsWasteWaterTable from './EChartsWasteWaterTable'
 
 export default {
   name: 'PublicChart',
   components: {
     EChartsHour,
-    // EChartsDate
+    EChartsDate,
+    ECharts,
+    EChartsTable,
     EChartsHourWasteWater,
-    EChartsDateWasteWater
+    EChartsDateWasteWater,
+    EChartsRealWasteWater,
+    EChartsWasteWaterTable
   },
   data () {
     return {
-      currentTab: 'EChartsHour',
-      active: '0'
+      currentTab: 'EChartsHourWasteWater'
     }
   },
   methods: {
-    tabTaggle (taggleMenu, num) {
+    tabTaggle (taggleMenu) {
       this.currentTab = taggleMenu
-      this.active = num
       // debugger
     }
   }

--
Gitblit v1.8.0