From c30d5534c86d48cdd94d06b6760aeb57df56963f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 22:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 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..153f9ae 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -2,7 +2,8 @@
<div class="app-container">
<el-card class="box-card" v-show="index !== 'image_resource_security'">
<el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
- <div v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px" :key="card.label">
+ <div style="margin-right: 20px;font-size: 18px">{{ruleName}}</div>
+ <div v-if="cardList && cardList.length > 0" v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px" :key="card.label">
<div>
<div class="icon-container">
<i :class="card.icon"></i>
@@ -25,7 +26,7 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="鍏抽敭璇�" prop="bayonetNumber">
<el-input v-model="queryParams.keyword" placeholder="鍏抽敭璇嶆悳绱�" clearable
@keyup.enter.native="handleQuery" />
@@ -82,12 +83,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" />
@@ -149,27 +151,13 @@
import { getToken } from "@/utils/auth";
export default {
name: "Platform",
- // watch: {
- // tableData: {
- // immediate: true,
- // deep: true,
- // handler(newVal) {
- // if(newVal && newVal.list) {
- // this.list = newVal.detail;
- // }
- // }
- // }
- // },
- // computed: {
- // startTime() {
- // var date = new Date();
- // var s1 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()-1);
- // return s1;
- // }
- // },
+ computed: {
+ ruleName() {
+ return this.$route.query.ruleName
+ }
+ },
data() {
return {
- list: [],
// 瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -238,6 +226,7 @@
],
},
+ showList: [],
tableHead: [],
cardList: [],
index: null
@@ -261,29 +250,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