From 3c93d885a3bc6a84079cc347bb30888d5fb98f11 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 6d3126f..584f1db 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>
<div class="legend" >
<span >姝ｅ父</span>
@@ -28,6 +28,7 @@
import ECharts from './Echarts'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'
+import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
export default {
name: 'PublicChart',
@@ -36,7 +37,8 @@
EChartsDate,
ECharts,
// EChartsDate
- EChartsHourWasteWater
+ EChartsHourWasteWater,
+ EChartsTable
},
data () {
return {
--
Gitblit v1.8.0