From 4bdafebef311d37a28f84c09dcf74bebb096dbb6 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期一, 23 六月 2025 14:43:50 +0800 Subject: [PATCH] 1、mdc设备多选输入框优化新增点击输入框同样触发查询按钮弹出抽屉或弹窗 2、解决进入过产品结构树页面后再进入设备日志页面后设备状态分布图样式变形问题以及优化组件代码 --- src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue b/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue index 4521965..8cde6f1 100644 --- a/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue +++ b/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue @@ -42,9 +42,18 @@ }, methods: { getHasPermissionUserByApi() { + const that = this + that.spinning = true + that.targetKeys = [] dncApi.getHasPermissionUserApi(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 }) }, @@ -58,20 +67,10 @@ isAssignSonNode: isAssignSonNode ? 1 : 2, userIdArray: moveKeys } - console.log('params--------------------------', params) - console.log(targetKeys, direction, moveKeys) if (direction === 'right') { method = dncApi.assignPermissionToUser } else { method = dncApi.removePermissionFromUser - const adminId = dataSource.find(item => item.username === 'admin').id - if (moveKeys.includes(adminId)) { - $notification.warning({ - message: '娑堟伅', - description: '涓嶈兘绉婚櫎绠$悊鍛樻潈闄�' - }) - return - } } that.spinning = true method(params) @@ -81,7 +80,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