From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 0e5fe9f..d80b3ae 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -4,17 +4,11 @@
<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">
<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>
@@ -24,7 +18,7 @@
<span >瓒呮爣</span>
<i style=" background: orange;"></i>
</div>
- <component :is="currentTab" v-bind="$attrs" ref="Echatrs"></component>
+ <component :is="currentTab" v-bind="$attrs" ref="Echats"></component>
</div>
</template>
@@ -34,46 +28,33 @@
import EChartsDate from './echarts/EChartsDate'
import EChartsTable from './echarts/EChartsTable'
-import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
-import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
-import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
-import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'
-
export default {
name: 'PublicChart',
components: {
EChartsHour,
EChartsDate,
ECharts,
- EChartsTable,
- EChartsRealWasteWater,
- EChartsHourWasteWater,
- EChartsDateWasteWater,
- EChartsWasteWaterTable
- },
- mounted () {
- this.$refs.Echatrs.CreateChart()
- this.$refs.Echatrs.effChartShow()
+ EChartsTable
},
data () {
return {
currentTab: this.current(),
- active: '1'
+ active: '0'
}
},
+ // updated () {
+ // this.$refs.Echats.DrawEXHRealTimeDateChart()
+ // },
methods: {
tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
this.active = num
- // debugger
},
current (currentTab) {
if (this.$attrs.value === 'feishui') {
- currentTab = 'EChartsHourWasteWater'
- console.log(currentTab)
+ currentTab = 'EChartsRealWasteWater'
} else {
- currentTab = 'EChartsHour'
- console.log(currentTab)
+ currentTab = 'ECharts'
}
return currentTab
}
--
Gitblit v1.8.0