From dc109551277dd40494a03a84e8a0bb8b9073e38c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 14:11:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 76eda5b..627b3bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -8,7 +8,7 @@
<li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
</ul>
<ul class="tab" v-else>
<li @click='tabTaggle("EChartsRealWasteWater")'>瀹炴椂鏁版嵁</li>
@@ -29,9 +29,11 @@
</template>
<script>
+ import ECharts from './Echarts'
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
-import ECharts from './Echarts'
+import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
+
import EChartsRealWasteWater from './EChartsRealWasteWater'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsDateWasteWater from './EChartsDateWasteWater'
@@ -42,9 +44,11 @@
EChartsHour,
EChartsDate,
ECharts,
+ EChartsTable,
EChartsHourWasteWater,
EChartsDateWasteWater,
EChartsRealWasteWater
+
},
data () {
return {
--
Gitblit v1.8.0