From f360cde8ff0b28ba677a4693cf45f47f206dd746 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 21 五月 2025 17:52:54 +0800
Subject: [PATCH] 1、设备管理中设备属性的字段显隐权限调整到设备状态字段 2、设备日志添加批量导出功能
---
src/views/system/modules/UserRecycleBinModal.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/views/system/modules/UserRecycleBinModal.vue b/src/views/system/modules/UserRecycleBinModal.vue
index 0e04220..c7f991f 100644
--- a/src/views/system/modules/UserRecycleBinModal.vue
+++ b/src/views/system/modules/UserRecycleBinModal.vue
@@ -92,7 +92,8 @@
{ title: '璐﹀彿', align: 'center', dataIndex: 'username' },
{ title: '濮撳悕', align: 'center', dataIndex: 'realname', },
{ title: '澶村儚', align: 'center', dataIndex: 'avatar', scopedSlots: { customRender: 'avatarslot' } },
- { title: '閮ㄩ棬', align: 'center', dataIndex: 'orgCode' },
+ // { title: '閮ㄩ棬', align: 'center', dataIndex: 'orgCode' },
+ { title: '杞﹂棿', align: 'center', dataIndex: 'productionName' },
{ title: '鎿嶄綔', align: 'center', dataIndex: 'action', width: 200, scopedSlots: { customRender: 'action' } }
],
url: {
@@ -144,7 +145,11 @@
if(res.success){
this.handleOk()
this.handleClearSelection()
- this.$message.success(`杩樺師 ${userIds.length} 涓敤鎴锋垚鍔燂紒`)
+ // this.$message.success(`杩樺師 ${userIds.length} 涓敤鎴锋垚鍔燂紒`)
+ this.$notification.success({
+ message:'娑堟伅',
+ description:`杩樺師 ${userIds.length} 涓敤鎴锋垚鍔燂紒`
+ });
}
})
}
@@ -156,22 +161,28 @@
title: '褰诲簳鍒犻櫎鐢ㄦ埛',
content: (<div>
<p>鎮ㄧ‘瀹氳褰诲簳鍒犻櫎杩� {userIds.length} 涓敤鎴峰悧锛�</p>
- <p style="color:red;">娉ㄦ剰锛氬交搴曞垹闄ゅ悗灏嗘棤娉曟仮澶嶏紝璇疯皑鎱庢搷浣滐紒</p>
- </div>),
- centered: true,
+ <p style="color:red;">娉ㄦ剰锛氬交搴曞垹闄ゅ悗灏嗘棤娉曟仮澶嶏紝璇疯皑鎱庢搷浣滐紒</p>
+ </div>),
+ centered: true,
onOk: () => {
- var that = this;
- deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
- if (res.success) {
- this.loadData()
- this.handleClearSelection()
- this.$message.success(`褰诲簳鍒犻櫎 ${userIds.length} 涓敤鎴锋垚鍔燂紒`)
- } else {
- that.$message.warning(res.message);
- }
- });
- },
- })
+ var that = this;
+ deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
+ if (res.success) {
+ this.loadData()
+ this.handleClearSelection()
+ that.$notification.success({
+ message:'娑堟伅',
+ description:`褰诲簳鍒犻櫎 ${userIds.length} 涓敤鎴锋垚鍔燂紒`
+ });
+ } else {
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ });
+ },
+ })
},
handleRevertBatch() {
this.handleRevert(this.selectedRowKeys)
--
Gitblit v1.9.3