From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue b/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue
index 3697384..f4268ae 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue
@@ -48,7 +48,10 @@
that.targetKeys = []
dncApi.getDeviceTreeHasPermissionUserApi(this.currentTreeNodeInfo)
.then(res => {
- if (res.success) this.targetKeys = res.list.map(item => item.id)
+ if (res.success) {
+ that.targetKeys = res.list.map(item => item.id)
+ if (that.targetKeys.includes(that.dataSource.find(item => item.username === 'admin').id)) that.$emit('setAdminDisabled')
+ }
})
.finally(() => {
that.spinning = false
@@ -65,12 +68,10 @@
isAssignSonNode: isAssignSonNode ? 1 : 2,
userIdArray: moveKeys
}
- console.log('params--------------------------', params)
- console.log(targetKeys, direction, moveKeys)
if (direction === 'right') {
- method = dncApi.assignPermissionToUser
+ method = dncApi.assignDeviceDeviceTreePermissionToUser
} else {
- method = dncApi.removePermissionFromUser
+ method = dncApi.removeDeviceTreePermissionFromUser
}
that.spinning = true
method(params)
@@ -80,7 +81,8 @@
message: '娑堟伅',
description: res.message
})
- this.targetKeys = targetKeys
+ that.targetKeys = targetKeys
+ if (targetKeys.includes(that.dataSource.find(item => item.username === 'admin').id)) that.$emit('setAdminDisabled')
} else {
$notification.error({
message: '娑堟伅',
--
Gitblit v1.9.3