From dcb1f3df891433b71bfbee3ac0dc4ec79f2a734d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 04:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/list.js | 139 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 63 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 10f315e..d1a8e7b 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -29,6 +29,9 @@
{
icon: 'el-icon-wind-power',
dataList: [
+ {
+ label: "骞冲彴鏁�"
+ }
]
}
]
@@ -323,6 +326,18 @@
{
icon: 'el-icon-wind-power',
dataList: [
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ label: '缁忓害寮傚父鏁�'
+ },
+ {
+ label: '绾害寮傚父鏁�'
+ },
]
}
],
@@ -641,19 +656,16 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'IP寮傚父鏁�'
},
{
- label: '鏈仈缃�'
+ label: 'MAC鍦板潃寮傚父鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: '缁忓害寮傚父鏁�'
},
{
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
+ label: '绾害寮傚父鏁�'
},
]
}
@@ -973,21 +985,17 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'IP寮傚父鏁�'
},
{
- label: '鏈仈缃�'
+ label: 'MAC鍦板潃寮傚父鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: '缁忓害寮傚父鏁�'
},
{
- label: '杞﹁締璇嗗埆'
+ label: '绾害寮傚父鏁�'
},
- {
- label: '浜哄憳璇嗗埆'
- },
-
]
}
],
@@ -1933,20 +1941,23 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: '璁惧鎬绘暟'
},
- {
- label: '鏈仈缃�'
- },
- {
- label: '瑙嗛鐩戞帶'
- },
- {
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
- },
+ // {
+ // label: '宸茶仈缃�'
+ // },
+ // {
+ // label: '鏈仈缃�'
+ // },
+ // {
+ // label: '瑙嗛鐩戞帶'
+ // },
+ // {
+ // label: '杞﹁締璇嗗埆'
+ // },
+ // {
+ // label: '浜鸿劯璇嗗埆'
+ // },
]
}
],
@@ -2123,21 +2134,17 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
},
{
- label: '鏈仈缃�'
+ label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
},
{
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
- },
-
+ label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+ }
]
}
],
@@ -2225,21 +2232,11 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
},
{
- label: '鏈仈缃�'
- },
- {
- label: '瑙嗛鐩戞帶'
- },
- {
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
- },
-
+ label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+ }
]
}
],
@@ -2393,6 +2390,9 @@
{
icon: 'el-icon-wind-power',
dataList: [
+ {
+ label: '璁惧鎬绘暟'
+ },
// {
// label: '宸茶仈缃�'
// },
@@ -2690,16 +2690,7 @@
icon: 'el-icon-truck',
dataList: [
{
- label: '姝ｅ父'
- },
- {
- label: '鏃犳暟鎹�'
- },
- {
- label: '鏁版嵁绐侀檷'
- },
- {
- label: '鏁版嵁閲忓皯'
+ label: '璁惧鎬绘暟'
},
]
}
@@ -2993,9 +2984,20 @@
],
card: [
{
- icon: 'el-icon-truck',
+ icon: 'el-icon-wind-power',
dataList: [
-
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ label: '缁忓害寮傚父鏁�'
+ },
+ {
+ label: '绾害寮傚父鏁�'
+ },
]
}
],
@@ -4321,7 +4323,18 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ label: '缁忓害寮傚父鏁�'
+ },
+ {
+ label: '绾害寮傚父鏁�'
+ },
]
}
],
--
Gitblit v1.8.0