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 | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 847d58e..6d3126f 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 :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("EChartsDate",2)'>鏃ユ暟鎹�</li>
- <li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -25,23 +25,27 @@
<script>
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
+ EChartsDate,
+ ECharts,
+ // EChartsDate
+ EChartsHourWasteWater
},
data () {
return {
- currentTab: 'EChartsHour',
- active: '0'
+ currentTab: 'EChartsHour'
}
},
methods: {
- tabTaggle (taggleMenu, num) {
+ tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- this.active = num
// debugger
}
}
--
Gitblit v1.8.0