From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index 71c1452..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)" 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"
>
@@ -65,7 +65,7 @@
:style="item.ruleName == '' ? 'display:none' : ''"
class="col-margin"
>
- <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl)" 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">
<i style="font-size: 40px; padding: 15px" :class="item.icon"></i>
<div>{{ item.ruleName }}</div>
@@ -102,7 +102,7 @@
:style="item.ruleName == '' ? 'display:none' : ''"
class="col-margin"
>
- <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl)" 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">
<i style="font-size: 40px; padding: 15px" :class="item.icon"></i>
<div>{{ item.ruleName }}</div>
@@ -139,7 +139,7 @@
:style="item.ruleName == '' ? 'display:none' : ''"
class="col-margin"
>
- <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl)" style="width: 100%">
+ <el-link @click="jumpToEquipment" style="width: 100%">
<el-card style="min-width: 150px;width:100%; height: 150px; text-align: center">
<i style="font-size: 40px; padding: 15px" :class="item.icon"></i>
<div>{{ item.ruleName }}</div>
@@ -363,10 +363,11 @@
equipment: [
{
ruleName: "璧勪骇绠＄悊",
- ruleIndex: 'view_zc_manage',
+ ruleIndex: 'assetManagement',
icon: "el-icon-wallet",
description: "鎻忚堪淇℃伅",
ruleCategory: "4",
+ apiUrl: 'assetManagement'
}
],
};
@@ -383,9 +384,14 @@
this.loading = false;
});
},
- handleDetail(item, index, url) {
+ jumpToEquipment() {
this.$router.push({
- path: `/data-manage/data-detail/index/1/1?type=${item.ruleCategory}&index=${index}&url=${url}`,
+ path: '/equipment'
+ });
+ },
+ 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}`
});
},
},
--
Gitblit v1.8.0