From d95b36a88357d018f76d926e9074c521eb8335a7 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/list.js | 109 ++++++++++++++++++++++++++++++++---
src/views/system/data-manage/data-detail/index.vue | 21 ++++++
src/views/system/data-manage/index.vue | 6 +-
3 files changed, 121 insertions(+), 15 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 706b14b..0f97f37 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -79,6 +79,11 @@
<el-form-item label="鍏抽敭璇�" prop="bayonetNumber">
<el-input v-model="queryParams.keyword" placeholder="鍏抽敭璇嶆悳绱�" clearable @input="handleQuery"/>
</el-form-item>
+ <el-form-item :label="this.optionsName" prop="option">
+ <el-select v-model="queryParams.option" size="small" clearable>
+ <el-option v-for="option in options" :key="option.value" :label="option.label" :value="option.value"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鏃堕棿" prop="date">
<el-date-picker
v-model="queryParams.date"
@@ -197,6 +202,7 @@
url: process.env.VUE_APP_BASE_API + "/platform/resourceSecurity/importData"
},
imageResourceSecurity: [],
+ options: [],
resourceForm: {},
resourceOpen: false,
totalKiosks: 1157,
@@ -229,6 +235,7 @@
keyword: '',
date: '',
dataType: 0,
+ option: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -258,7 +265,11 @@
index: null
};
},
+
mounted() {
+ //淇敼椤电鍚�
+ const obj = Object.assign({},this.$route,{title: this.$route.query.ruleName})
+ this.$tab.updatePage(obj);
// 鑾峰彇褰撳墠鏃ユ湡
const today = new Date();
@@ -269,31 +280,39 @@
// 鎷兼帴鎴� yyyy-MM-dd 鏍煎紡
this.queryParams.date = `${year}-${month}-${day}`;
+
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;
this.showList = data.showList;
+ this.options = data.options;
+ this.optionsName = data.optionsName;
}
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;
+ this.options = data.options;
+ this.optionsName = data.optionsName;
}
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;
+ this.options = data.options;
+ this.optionsName = data.optionsName;
}
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.options = data.options;
+ this.optionsName = data.optionsName;
}
- this.getDicts(this.$route.query.dict)
this.getList();
},
methods: {
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index cbfbebd..fea4339 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -1093,7 +1093,16 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -1110,6 +1119,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "鐐逛綅鍦ㄧ嚎鐜�",
@@ -1172,7 +1187,16 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -1189,9 +1213,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
- dict: [
-
- ]
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "褰曞儚鍙敤鐜�",
@@ -1752,7 +1779,16 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -1769,6 +1805,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '閲嶇偣鐐逛綅褰曞儚鍙敤鐜�',
@@ -2127,7 +2169,16 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -2144,6 +2195,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "瑙嗛鍥惧儚璐ㄩ噺妫�娴嬫姤鍛�",
@@ -2405,11 +2462,26 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
- ]
+ ],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼',
@@ -3753,11 +3825,26 @@
label: '璁惧鎬绘暟'
},
{
- label: '浠婃棩鍦ㄧ嚎鐜�'
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
- ]
+ ],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '鐩綍涓�鑷寸巼',
diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index 165c0a2..a431499 100644
--- a/src/views/system/data-manage/index.vue
+++ b/src/views/system/data-manage/index.vue
@@ -26,7 +26,7 @@
:style="item.ruleName == '' ? 'display:none' : ''"
class="col-margin"
>
- <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl, item.ruleName,item.dict)" style="width: 100%">
+ <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl, item.ruleName)" style="width: 100%">
<el-card
style="min-width: 150px;width:100%; height: 150px; text-align: center"
>
@@ -389,9 +389,9 @@
path: '/equipment'
});
},
- handleDetail(item, index, url, ruleName,dict) {
+ handleDetail(item, index, url, ruleName) {
this.$router.push({
- path: `/data-manage/data-detail/index/1/1?type=${item.ruleCategory}&index=${index}&url=${url}&ruleName=${ruleName}&dict=${dict}`
+ path: `/data-manage/data-detail/index/1/1?type=${item.ruleCategory}&index=${index}&url=${url}&ruleName=${ruleName}`
});
},
},
--
Gitblit v1.8.0