From f2d1b5615b05c002ec63db4df7164c9ed3ecc4a3 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 26 八月 2025 16:42:21 +0800
Subject: [PATCH] 1、优化产品结构树以及设备结构树、列表右键菜单重复右键后出现window菜单问题 2、优化产品结构树节点删除后的loading展示时机 3、优化产品以及设备结构树权限配置获取列表时的loading展示时机

---
 src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue b/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
index 69b115e..c11061f 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
@@ -13,7 +13,8 @@
     <a-tabs v-model="activeTabKey">
       <a-tab-pane :key="1" tab="鍒嗛厤鐢ㄦ埛">
         <UserPermissionTransfer ref="userPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
-                                :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"/>
+                                :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"
+                                @setAdminDisabled="setAdminDisabled"/>
       </a-tab-pane>
     </a-tabs>
   </a-modal>
@@ -22,7 +23,6 @@
 <script>
   import dncApi from '@/api/dnc'
   import UserPermissionTransfer from './UserPermissionTransfer'
-  import { queryProductionTreeList } from '@/api/api'
 
   export default {
     name: 'AssignPermissionModal',
@@ -66,20 +66,29 @@
 
       // 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夌敤鎴峰垪琛�
       getAllUsersListByApi() {
+        this.$nextTick(() => {
+          this.$refs.userPermissionTransferRef.spinning = true
+          this.allUsersList = []
+          this.$refs.userPermissionTransferRef.targetKeys = []
+        })
         dncApi.getAllUsersListApi()
           .then(res => {
             if (res.success) {
-              this.allUsersList = res.result.records.map(item => {
-                return {
-                  ...item,
-                  disabled: item.username === 'admin'
-                }
-              })
+              this.allUsersList = res.result
               this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
             }
           })
       },
 
+      setAdminDisabled() {
+        this.allUsersList = this.allUsersList.map(item => {
+          return {
+            ...item,
+            disabled: item.username === 'admin'
+          }
+        })
+      },
+
       // 鎺у埗寮圭獥鍏抽棴
       handleModalClose() {
         this.visible = false

--
Gitblit v1.9.3