From dde5df08bdcecbbc61f1a4a004803b693cc660aa Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 15:29:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 7843e9c..1ad269f 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -4,15 +4,17 @@
<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 @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>-->
-<!-- <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>-->
-<!-- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>-->
-<!-- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>-->
+ <ul class="tab" v-if="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>
+ <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>
+ <li :class="active==3?'hover':''" @click='tabTaggle("EChartsWasteWaterTable",3)'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -27,12 +29,15 @@
</template>
<script>
+import ECharts from './echarts/Echarts'
import EChartsHour from './echarts/EChartsHour'
import EChartsDate from './echarts/EChartsDate'
-import ECharts from './echarts/Echarts'
-// import EChartsDate from './EChartsDate'
+import EChartsTable from './echarts/EChartsTable'
+
+import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
-import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
+import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
+import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'
export default {
name: 'PublicChart',
@@ -40,16 +45,21 @@
EChartsHour,
EChartsDate,
ECharts,
- // EChartsDate
+ EChartsTable,
+ EChartsRealWasteWater,
EChartsHourWasteWater,
- EChartsTable
+ EChartsDateWasteWater,
+ EChartsWasteWaterTable
+ },
+ mounted () {
+ this.$refs.Echatrs.CreateChart()
},
updated () {
this.$refs.Echats.CreateChart()
},
data () {
return {
- currentTab: EChartsHour,
+ currentTab: this.current(),
active: '1'
}
},
@@ -58,6 +68,14 @@
this.currentTab = taggleMenu
this.active = num
// debugger
+ },
+ current (currentTab) {
+ if (this.$attrs.value === 'feishui') {
+ currentTab = 'EChartsHourWasteWater'
+ } else {
+ currentTab = 'EChartsHour'
+ }
+ return currentTab
}
}
}
--
Gitblit v1.8.0