From dae8cdecc05c1d64189d261364ce7fda9c4f505b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 21:14:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/index.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 33cf76e..df57a6b 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -82,12 +82,13 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <div v-if="tableData.list && tableData.list.length >0">
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
+
+ <div>
<el-table v-loading="loading" :data="tableData.list">
- <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" v-if="item"/>
+ <el-table-column :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead" :key="index" v-if="showListPD(item)"/>
</el-table>
</div>
- <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
@@ -238,6 +239,7 @@
],
},
+ showList: [],
tableHead: [],
cardList: [],
index: null
@@ -261,29 +263,43 @@
this.index = this.$route.query.index;
if (this.$route.query.type === '1') {
let data = videoData.table.filter(item => item.index === this.$route.query.index)[0]
-
this.tableHead = data.columns;
this.cardList = data.card;
- console.log(this.cardList, "wcnm")
+ this.showList = data.showList;
}
if (this.$route.query.type === '2') {
let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
if (this.$route.query.type === '3') {
let data = faceData.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
if (this.$route.query.type === '4') {
let data = equipment.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
this.getList();
},
methods: {
+ showListPD(item) {
+ if (!this.showList) {
+ return true
+ }
+ let arr = this.showList.filter(d => d.label === item.label)
+ if (item && (!arr || arr.length <1)) {
+ return true;
+ } else {
+ return item && arr && arr.length > 0 && arr[0].visible
+ }
+
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleResourceUpdate(row) {
this.reset("resourceForm");
--
Gitblit v1.8.0