大屏

project/dv/apps/AppGridDV.vue

@@ -360,11 +360,11 @@
             }
 
             this.$nextTick(() => {
-              this.autoScale()
               if (level === '2') {
                 this.getUserList(id)
               } else {
                 this.isLoading = false
+                this.autoScale()
               }
             })
           }
@@ -399,8 +399,8 @@
               label: '子节点',
               userList: userList || []
             }, node)
-
             this.$nextTick(() => {
+              console.log('---------')
               this.autoScale()
             })
           }
@@ -433,7 +433,19 @@
             }
           }) : []
 
-          userList = [...girdMemberManageList, ...girdMemberList]
+          if (this.girdLevel === '2' && item.girdLevel === '2' && girdMemberList.length) {
+            userList = girdMemberManageList
+            item.girdList = [{
+              girdLevel: '2',
+              id: item.id,
+              isUser: false,
+              userList: girdMemberList,
+              label: item.girdName,
+              children: []
+            }]
+          } else {
+            userList = [...girdMemberManageList, ...girdMemberList]
+          }
           if (!userList.length) {
             userList = [{
               label: '-',
@@ -445,14 +457,14 @@
 
           const obj = {
             label: item.girdName,
-            id: item.id,
+            id: `${new Date().getTime()}-${item.id}`,
             girdLevel: item.girdLevel,
             isUser: false,
             userList: userList,
             children: item.girdList || []
           }
 
-          if (obj.children && obj.children.length) {
+          if (obj.children && obj.children.length && this.girdLevel !== '2') {
             obj.children = this.formatList(obj.children)
           }
 
@@ -770,7 +782,7 @@
         padding: 20px;
         overflow: hidden;
         width: max-content;
-        height: inherit;
+        height: 200%;
       }
 
       ::v-deep .org-chart-container {