From 097581b136c5889c71c07fb6f17d2f2885ce5a78 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 16:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index a9617c9..794a621 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,31 +1,25 @@
<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-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>
+ <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>
</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'
@@ -35,6 +29,7 @@
export default {
name: 'tabHandover',
components: {
+ Public,
WasteWater,
// WasteGas,
// SoilGroundwater,
@@ -43,12 +38,16 @@
},
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) {
--
Gitblit v1.8.0