From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/tabHandover.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 311d7b6..a9617c9 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tabs v-model="activeName" @tab-click="handleClick">
<!-- <el-tab-pane label="搴熸按" name="first">
<waste-water></waste-water>
</el-tab-pane>
@@ -23,8 +23,11 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
-// import WasteGas from '@components/table/components/WasteGas'
-import SolidWaste from '@components/table/components/SolidWaste'
+
+import SoilGroundwater from '@components/table/components/SoilGroundwater'
+
+import WasteGas from '@components/table/components/WasteGas'
+import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'
import { TopicList } from '../../../conf/Topic'
@@ -34,6 +37,7 @@
components: {
WasteWater,
// WasteGas,
+ // SoilGroundwater,
SolidWaste,
AirQuality
},
@@ -55,7 +59,7 @@
this.gcComp = WasteWater
break
case '搴熸皵':
- this.gcComp = WasteWater
+ this.gcComp = WasteGas
break
case '鍥哄簾':
this.gcComp = SolidWaste
@@ -64,7 +68,7 @@
this.gcComp = AirQuality
break
case '鍦熷￥鍙婂湴涓嬫按':
- this.gcComp = AirQuality
+ this.gcComp = SoilGroundwater
break
case '绠＄嚎':
this.gcComp = AirQuality
--
Gitblit v1.8.0