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 | 5 +++--
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 86445ef..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>
@@ -72,6 +72,7 @@
} else {
currentTab = 'ECharts'
}
+ debugger
return currentTab
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 896d123..fecb54d 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -1,4 +1,4 @@
-<!-- 灏忔椂鏁版嵁 -->
+git<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
<div class="infomation">
@@ -135,9 +135,10 @@
}
},
mounted () {
+ this.onSubmit()
// this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
// this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
- this.onSubmit()
+ // this.onSubmit()
},
updated () {
this.onSubmit()
--
Gitblit v1.8.0