From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index ed43d60..35a1739 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -4,7 +4,8 @@
<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