From 300e019d85ab8d8a671a6b7773997e40fff56d58 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 16:21:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
index 3d868a1..54b47c0 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -1,11 +1,13 @@
 <template>
 <div>
   <el-tabs v-model="activeName">
-    <el-tab-pane label="瀹炴椂鏁版嵁" name="first">鐢ㄦ埛绠$悊</el-tab-pane>
-    <el-tab-pane label="鏃ユ暟鎹�" name="second">閰嶇疆绠$悊</el-tab-pane>
-    <el-tab-pane label="鏈堟暟鎹�" name="third">瑙掕壊绠$悊</el-tab-pane>
-    <el-tab-pane label="浜哄伐鏁版嵁" name="fourth">瀹氭椂浠诲姟琛ュ伩</el-tab-pane>
+    <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">瀹炶瘯鏁版嵁</el-tab-pane>
+    <el-tab-pane label="鏃ユ暟鎹�" name="second">鏃ユ暟鎹�</el-tab-pane>
+    <el-tab-pane label="鏈堟暟鎹�" name="third">鏈堟暟鎹�</el-tab-pane>
+    <el-tab-pane label="浜哄伐鏁版嵁" name="fourth">浜哄伐鏁版嵁</el-tab-pane>
   </el-tabs>
+<!--  <EchartsTab></EchartsTab>-->
+<!--  <GasECharts></GasECharts>>-->
 </div>
 </template>
 

--
Gitblit v1.8.0