浏览代码

看板fix

jwyu 8 月之前
父节点
当前提交
a600feaa90

+ 1 - 1
src/views/BI_manage/components/SetShare.vue

@@ -86,7 +86,7 @@ export default {
     },
     show(n){
       if(n){
-        this.open=this.boardInfo.IsGrant||false
+        this.open=this.boardInfo.IsGrant?true:false
         this.getSelectUser()
       }
     }

+ 9 - 2
src/views/BI_manage/index.vue

@@ -274,9 +274,16 @@ export default {
             label: '共享给我的',
             value: 'other_share',
             children: otherArr.map(item => {
+              const cArr=item.DashboardList.map(_i=>{
+                return{
+                  label: _i.BiDashboardName,
+                  value: _i.BiDashboardId,
+                }
+              })
               return {
-                label: item.BiDashboardName,
-                value: item.BiDashboardId
+                label: item.GroupName,
+                value: item.GroupId,
+                children:cArr
               }
             })
           }

+ 15 - 5
src/views/home_manage/components/SelectBoard.vue

@@ -107,7 +107,7 @@ export default {
       }
     },
 
-    // 公共看板列表
+    // 看板列表
     async getList(type) {
       const resMy = await apiBiBoard.myBoardList()
       if (resMy.Ret === 200) {
@@ -139,25 +139,33 @@ export default {
             label: '共享给我的',
             value: 'other_share',
             children: otherArr.map(item => {
+              const cArr=item.DashboardList.map(_i=>{
+                return{
+                  label: _i.BiDashboardName,
+                  value: _i.BiDashboardId,
+                }
+              })
               return {
-                label: item.BiDashboardName,
-                value: item.BiDashboardId
+                label: item.GroupName,
+                value: item.GroupId,
+                children:cArr
               }
             })
           }
         ]
       }
+
       const resCommon = await apiBiBoard.commonBoardList()
       if(resCommon.Ret===200){
         const arr=resCommon.Data||[]
         this.list[2].children=arr.map(item1=>{
-          const obj1={
+          let obj1={
             label:item1.GroupName,
             value:item1.GroupId+item1.GroupName,
             children:[]
           }
           obj1.children=item1.Children?item1.Children.map(item2=>{
-            const obj2={
+            let obj2={
               label:item2.GroupName,
               value:item2.GroupId+item2.GroupName,
               children:[]
@@ -168,7 +176,9 @@ export default {
                 value:item3.BiDashboardId,
               }
             }):[]
+            return obj2
           }):[]
+          console.log(obj1);
 
           return obj1
         })