From ca2a7113f660f523518c4be431534e7eebaa297e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 794a621..0a92b64 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,47 +1,43 @@
<template>
- <Public>
- <template v-slot:title>
- <span>{{ titleProp }}</span>
- </template>
- <template v-slot:publicTable>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
- </el-tabs>
- <div>
- <component :is="gcComp"></component>
- </div>
- </template>
- </Public>
+ <div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
+ </el-tabs>
+ <div>
+ <component :is="gcComp"></component>
+ </div>
+ </div>
</template>
<script>
-
-import Public from '@components/table/Public'
import WasteWater from '@components/table/components/WasteWater'
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 PollutionSource from '@components/table/components/PollutionSource'
+import EnvironmentalRisk from '@components/table/components/EnvironmentalRisk'
+import Pipeline from '@components/table/components/Pipeline'
+import CorporateEmergency from '@components/table/components/CorporateEmergency'
import { TopicList } from '../../../conf/Topic'
-
export default {
name: 'tabHandover',
components: {
- Public,
WasteWater,
// WasteGas,
// SoilGroundwater,
SolidWaste,
- AirQuality
+ PollutionSource,
+ EnvironmentalRisk,
+ Pipeline,
+ CorporateEmergency
},
data () {
return {
titleProp: '',
- activeName: 'gcComp',
- topicList: TopicList,
- gcComp: AirQuality
+ activeName: '姹℃煋婧�',
+ topicList: TopicList, // tab椤�
+ gcComp: PollutionSource
}
},
methods: {
@@ -49,10 +45,9 @@
this.titleProp = item
},
handleClick (tab, event) {
- console.log(tab.label)
switch (tab.label) {
case '姹℃煋婧�':
- this.gcComp = AirQuality
+ this.gcComp = PollutionSource
break
case '搴熸按':
this.gcComp = WasteWater
@@ -64,13 +59,16 @@
this.gcComp = SolidWaste
break
case '鐜椋庨櫓':
- this.gcComp = AirQuality
+ this.gcComp = EnvironmentalRisk
break
case '鍦熷￥鍙婂湴涓嬫按':
this.gcComp = SoilGroundwater
break
case '绠＄嚎':
- this.gcComp = AirQuality
+ this.gcComp = Pipeline
+ break
+ case '浼佷笟搴旀��':
+ this.gcComp = CorporateEmergency
break
}
}
--
Gitblit v1.8.0