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

packages/bigscreen/viewer/AppGigscreenViewer.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script>
-  import RenderElement from '../designer/components/RenderElement' 
+  import RenderElement from '../designer/components/RenderElement'
   // import AppGridDV from '../../../project/dv/apps/AppGridDV'
 
   export default {

project/dv/apps/AppGridDV.vue

@@ -292,14 +292,15 @@
             style: {
               display: v.girdLevel === '2' ? 'block' : 'none',
               fontSize: v.girdLevel === '2' ? '12px' : ''
-            },
-            attrs: {
-              title: v.girdLevel === '2' ? (v.checkType === '1' ? '网格员' : '网格长') : v.girdName
             }
-          }, v.girdLevel === '2' ? (v.checkType === '1' ? '网格员' : '网格长') : v.girdName)])
+          }, v.checkType ? (v.girdLevel === '2' ? '网格员' : '网格长') :'-')])
         })), h('div', {
-          display: node.data.girdLevel < '2' ? 'block' : 'none',
-          style: 'color: rgba(255, 255, 255, 0.8); font-weight: 500; font-size: 12px; margin: 4px 0;'
+          style: {
+            display: node.data.label === '子节点' ? 'none' : 'block',
+            color: 'rgba(255, 255, 255, 0.8)',
+            fontSize: '12px',
+            margin: '4px 0'
+          }
         }, node.data.label)])
       },
 
@@ -327,7 +328,36 @@
       getGirdInfo (id, level) {
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
-            this.chartData = this.formatList(res.data)
+            const chartData = this.formatList(res.data)
+            if (res.data && res.data[0] && res.data[0].parentGirdInfo) {
+              const parentGirdInfo = res.data[0].parentGirdInfo
+              const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
+                return {
+                  ...v,
+                  label: v.name,
+                  id: v.id,
+                  checkType: '2',
+                  girdName: parentGirdInfo.girdName,
+                  girdLevel: parentGirdInfo.girdLevel,
+                  isUser: true
+                }
+              }) : [{
+                label: '-',
+                id: parentGirdInfo.id,
+                girdLevel: parentGirdInfo.girdLevel,
+                girdName: parentGirdInfo.girdName
+              }]
+              this.chartData = [{
+                label: parentGirdInfo.girdName,
+                id: parentGirdInfo.id,
+                girdLevel: parentGirdInfo.girdLevel,
+                isUser: false,
+                children: chartData,
+                userList: girdMemberList
+              }]
+            } else {
+              this.chartData = chartData
+            }
 
             this.$nextTick(() => {
               this.autoScale()
@@ -364,6 +394,15 @@
             }
 
             const node = this.$refs.VueOkrTree.getNode(id)
+              this.$refs.VueOkrTree.append({
+                id: new Date().getTime(),
+                label: '子节点',
+                userList: userList || []
+              }, node)
+
+              this.$nextTick(() => {
+                this.autoScale()
+              })
 
             if (userList.length) {
               this.$refs.VueOkrTree.append({
@@ -409,7 +448,7 @@
           userList = [...girdMemberManageList, ...girdMemberList]
           if (!userList.length) {
             userList = [{
-              label: item.girdName,
+              label: '-',
               id: item.id,
               girdLevel: item.girdLevel,
               girdName: item.girdName
@@ -556,6 +595,7 @@
       .userlist {
         display: flex;
         align-items: center;
+        justify-content: center;
         padding: 10px;
         background: rgba(76, 166, 255, 0.1);
         border: 1px solid rgba(255, 255, 255, 0.2);
@@ -578,7 +618,7 @@
 
           p {
             max-width: 120px;
-            margin: 4px 0;
+            margin: 4px 0 0 0;
             font-size: 19px;
             text-align: center;
             overflow: hidden;
@@ -605,8 +645,12 @@
 
           &.user-item-2 {
             p {
+              line-height: 14px;
               font-size: 12px;
-              margin-bottom: 0;
+              margin-bottom: 4px;
+            }
+            span {
+              line-height: 14px;
             }
             img {
               width: 40px;
@@ -702,8 +746,8 @@
       margin-left: 20px;
 
       & > div {
+        flex: 1;
         width: 100%;
-        height: 440px;
         padding-bottom: 20px;
         background: rgba(7, 11, 35, 0.4);
         border: 1px solid #2D50B5;
@@ -713,6 +757,10 @@
           height: calc(100% - 82px);
           padding: 0 20px;
         }
+
+        &:last-child {
+          margin-top: 20px;
+        }
       }
     }