From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 9f1f275..c3e087a 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -17,8 +17,9 @@
import SolidWaste from '@components/table/components/WasteSolid'
import PollutionSource from '@components/table/components/PollutionSource'
import EnvironmentalRisk from '@components/table/components/EnvironmentalRisk'
-
-import { TopicList } from '../../../conf/Topic'
+import Pipeline from '@components/table/components/Pipeline'
+import CorporateEmergency from '@components/table/components/CorporateEmergency'
+import { topicList } from '../../../conf/Topic'
export default {
name: 'tabHandover',
components: {
@@ -27,14 +28,16 @@
// SoilGroundwater,
SolidWaste,
PollutionSource,
- EnvironmentalRisk
+ EnvironmentalRisk,
+ Pipeline,
+ CorporateEmergency
},
data () {
return {
titleProp: '',
activeName: '姹℃煋婧�',
- topicList: TopicList, // tab椤�
- gcComp: PollutionSource // 榛樿鏄剧ず姹℃煋婧愬唴瀹�
+ topicList: topicList, // tab椤�
+ gcComp: PollutionSource
}
},
methods: {
@@ -62,7 +65,10 @@
this.gcComp = SoilGroundwater
break
case '绠＄嚎':
- // this.gcComp = AirQuality
+ this.gcComp = Pipeline
+ break
+ case '浼佷笟搴旀��':
+ this.gcComp = CorporateEmergency
break
}
}
--
Gitblit v1.8.0