From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 4ceacba..b61ec1e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,10 +5,10 @@
         <div class="border_corner border_corner_left_bottom"></div>
         <div class="border_corner border_corner_right_bottom"></div>
         <ul class="tab">
-            <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
-            <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
-            <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
-            <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+            <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>
         <div class="legend" >
             <span >姝e父</span>
@@ -24,22 +24,26 @@
 
 <script>
 import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
+// import EChartsDate from './EChartsDate'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
 
 export default {
   name: 'PublicChart',
   components: {
     EChartsHour,
-    EChartsDate
+    // EChartsDate
+    EChartsHourWasteWater
   },
   data () {
     return {
-      currentTab: 'EChartsHour'
+      currentTab: 'EChartsHour',
+      active: '0'
     }
   },
   methods: {
-    tabTaggle (taggleMenu) {
+    tabTaggle (taggleMenu, num) {
       this.currentTab = taggleMenu
+      this.active = num
       // debugger
     }
   }
@@ -107,10 +111,10 @@
     margin-right: 10px;
     padding:0 15px
 }
-
+.tab li.hover,
 .tab li:hover {
   background-color: #0e639e;
-  color: #682000;
+  color: #fff;
   cursor: pointer;
 }
 .legend{

--
Gitblit v1.8.0