From 6f256a8be5c330cbf4d852f7dc4a1a6614f0419d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:11:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/table/components/tabHandover.vue |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index ed43d60..a346334 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,10 +1,11 @@
 <template>
-  <el-tabs  v-model="activeName" type="border-card">
+  <el-tabs  v-model="activeName">
     <el-tab-pane label="搴熸按" name="first">
       <waste-water></waste-water>
     </el-tab-pane>
     <el-tab-pane label="搴熸皵" name="second">
-      <waste-gas></waste-gas>
+      <waste-water></waste-water>
+<!--      <waste-gas></waste-gas>-->
     </el-tab-pane>
     <el-tab-pane label="鍥哄簾" name="third">
       <solid-waste></solid-waste>
@@ -17,14 +18,14 @@
 
 <script>
 import WasteWater from '@components/table/components/WasteWater'
-import WasteGas from '@components/table/components/WasteGas'
+// import WasteGas from '@components/table/components/WasteGas'
 import SolidWaste from '@components/table/components/SolidWaste'
 import AirQuality from '@components/table/components/AirQuality'
 export default {
   name: 'tabHandover',
   components: {
     WasteWater,
-    WasteGas,
+    // WasteGas,
     SolidWaste,
     AirQuality
   },

--
Gitblit v1.8.0