From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期五, 21 五月 2021 14:30:44 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/components/tabHandover.vue | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue index 311d7b6..1665928 100644 --- a/src/components/table/components/tabHandover.vue +++ b/src/components/table/components/tabHandover.vue @@ -1,18 +1,6 @@ <template> <div> - <el-tabs v-model="activeName" @tab-click="handleClick"> - <!-- <el-tab-pane label="搴熸按" name="first"> - <waste-water></waste-water> - </el-tab-pane> - <el-tab-pane label="搴熸皵" name="second"> - <waste-water></waste-water> - </el-tab-pane> - <el-tab-pane label="鍥哄簾" name="third"> - <solid-waste></solid-waste> - </el-tab-pane> - <el-tab-pane label="绌烘皵璐ㄩ噺" name="fourth"> - <AirQuality></AirQuality> - </el-tab-pane> --> + <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> @@ -22,9 +10,11 @@ </template> <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,17 +24,22 @@ components: { WasteWater, // WasteGas, + // SoilGroundwater, SolidWaste, AirQuality }, data () { return { - activeName: 'first', + titleProp: '', + activeName: 'gcComp', topicList: TopicList, gcComp: AirQuality } }, methods: { + refsDatatitle (item) { + this.titleProp = item + }, handleClick (tab, event) { console.log(tab.label) switch (tab.label) { @@ -55,7 +50,7 @@ this.gcComp = WasteWater break case '搴熸皵': - this.gcComp = WasteWater + this.gcComp = WasteGas break case '鍥哄簾': this.gcComp = SolidWaste @@ -64,7 +59,7 @@ this.gcComp = AirQuality break case '鍦熷¥鍙婂湴涓嬫按': - this.gcComp = AirQuality + this.gcComp = SoilGroundwater break case '绠$嚎': this.gcComp = AirQuality -- Gitblit v1.8.0