From 91a1b18cd9b949c65e493d802cfb8393667b214d Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期四, 27 五月 2021 21:50:42 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/components/tabHandover.vue | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue index cd396fc..43896f1 100644 --- a/src/components/table/components/tabHandover.vue +++ b/src/components/table/components/tabHandover.vue @@ -1,47 +1,44 @@ <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: 'first', - topicList: TopicList, - gcComp: AirQuality + activeName: '姹℃煋婧�', + topicList: TopicList, // tab椤� + gcComp: PollutionSource // 榛樿鏄剧ず姹℃煋婧愬唴瀹� } }, methods: { @@ -49,10 +46,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 +60,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