Merge remote-tracking branch 'origin/dev' into dev

project/dv/apps/AppGridDV.vue

@@ -17,7 +17,7 @@
         </el-tree>
       </div>
     </div>
-    <div class="middle" ref="container" v-loading="isLoading" element-loading-background="rgba(0, 0, 0, 0.5)">
+    <div class="middle" :class="[girdLevel === '2' ? 'middle-active' : '']" ref="container" v-loading="isLoading" element-loading-background="rgba(0, 0, 0, 0.5)">
       <div
         ref="middleTree"
         id="tree"
@@ -293,7 +293,7 @@
               display: v.girdLevel === '2' ? 'block' : 'none',
               fontSize: v.girdLevel === '2' ? '12px' : ''
             }
-          }, v.checkType ? (v.girdLevel === '2' ? '网格员' : '网格长') :'-')])
+          }, v.checkType ? (v.checkType === '1' ? '网格员' : '网格长') :'-')])
         })), h('div', {
           style: {
             display: node.data.label === '子节点' ? 'none' : 'block',
@@ -394,27 +394,15 @@
             }
 
             const node = this.$refs.VueOkrTree.getNode(id)
-              this.$refs.VueOkrTree.append({
+            this.$refs.VueOkrTree.append({
-                id: new Date().getTime(),
+              id: new Date().getTime(),
-                label: '子节点',
+              label: '子节点',
-                userList: userList || []
+              userList: userList || []
-              }, node)
+            }, node)
 
-              this.$nextTick(() => {
+            this.$nextTick(() => {
-                this.autoScale()
+              this.autoScale()
-              })
+            })
-
-            if (userList.length) {
-              this.$refs.VueOkrTree.append({
-                id: new Date().getTime(),
-                label: '子节点',
-                userList: userList || []
-              }, node)
-
-              this.$nextTick(() => {
-                this.autoScale()
-              })
-            }
           }
         })
       },
@@ -808,6 +796,15 @@
           // max-width: 500px;
         }
       }
+
+      &.middle-active {
+        ::v-deep .org-chart-container {
+          .org-chart-node {
+            // max-width: 500px;
+            float:initial;
+          }
+        }
+      }
     }
 
     .left {