From 98240a8e15dec2d2fb88b2c6eb1be684c7543e5e Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 11:03:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 282bb30..c01128b 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -4,13 +4,13 @@
<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" v-if="this.$attrs.value === 'feiqi'">
+ <ul class="tab" v-show="this.$attrs.value === 'feiqi'">
<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("EChartsTable",3)'>浜哄伐鏁版嵁</li>
</ul>
- <ul class="tab" v-else>
+ <ul class="tab" v-show="this.$attrs.value !== 'feiqi'">
<li :class="active==0?'hover':''" @click='tabTaggle("EChartsRealWasteWater",0)'>瀹炴椂鏁版嵁</li>
<li :class="active==1?'hover':''" @click='tabTaggle("EChartsHourWasteWater",1)'>灏忔椂鏁版嵁</li>
<li :class="active==2?'hover':''" @click='tabTaggle("EChartsDateWasteWater",2)'>鏃ユ暟鎹�</li>
@@ -51,18 +51,15 @@
EChartsDateWasteWater,
EChartsWasteWaterTable
},
- mounted () {
- this.$refs.Echatrs.CreateChart()
- },
- updated () {
- this.$refs.Echats.CreateChart()
- },
data () {
return {
currentTab: this.current(),
- active: '1'
+ active: '0'
}
},
+ // updated () {
+ // this.$refs.Echats.DrawEXHRealTimeDateChart()
+ // },
methods: {
tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
@@ -71,12 +68,11 @@
},
current (currentTab) {
if (this.$attrs.value === 'feishui') {
- currentTab = 'EChartsHourWasteWater'
- console.log(currentTab)
+ currentTab = 'EChartsRealWasteWater'
} else {
- currentTab = 'EChartsHour'
- console.log(currentTab)
+ currentTab = 'ECharts'
}
+ debugger
return currentTab
}
}
--
Gitblit v1.8.0