From af153c8d632eef5bcf6210182a5585b313a35e27 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 11:24:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

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

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 1c442fd..6d3126f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -26,13 +26,17 @@
 import EChartsHour from './EChartsHour'
 import EChartsDate from './EChartsDate'
 import ECharts from './Echarts'
+// import EChartsDate from './EChartsDate'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
 
 export default {
   name: 'PublicChart',
   components: {
     EChartsHour,
     EChartsDate,
-    ECharts
+    ECharts,
+    // EChartsDate
+    EChartsHourWasteWater
   },
   data () {
     return {
@@ -45,9 +49,6 @@
       // debugger
     }
   }
-  // created () {
-  //   this.$refs.CreateChart
-  // }
 }
 
 </script>
@@ -112,10 +113,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