From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 05 六月 2025 15:18:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue b/src/views/dnc/base/modules/DeviceStructure/Permission/UserPermissionTransfer.vue index ba5aec7..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,8 +68,6 @@ isAssignSonNode: isAssignSonNode ? 1 : 2, userIdArray: moveKeys } - console.log('params--------------------------', params) - console.log(targetKeys, direction, moveKeys) if (direction === 'right') { method = dncApi.assignDeviceDeviceTreePermissionToUser } else { @@ -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