bi看板

src/api/modules/BIBoard.js

@@ -27,5 +27,52 @@ export default{
   editBoard:params=>{
     return http.post('/bi_dashborad/edit',params)
   },
+  // 看板元素拖动
+  moveBoardElement:params=>{
+    return http.post('/bi_dashborad/detail/move',params)
+  },
+
+  // 表格详情
+  tableDetail:params=>{
+    return http.get('/datamanage/excel_info/table_data',params)
+  },
+
+  // 新增看板公共分类
+  addCommonClassify:params=>{
+    return http.post('/bi_dashborad/classify/add',params)
+  },
+  // 公共看板分类数据
+  commonClassifyList:params=>{
+    return http.get('/bi_dashborad/classify/list',{})
+  },
+   // 编辑看板公共分类
+  editCommonClassify:params=>{
+    return http.post('/bi_dashborad/classify/edit',params)
+  },
+  // 编辑看板公共分类
+  deleteCommonClassify:params=>{
+    return http.post('/bi_dashborad/classify/del',params)
+  },
+  // 将看板设置为公共看板
+  setBoardCommon:params=>{
+    return http.post('/bi_dashborad/public',params)
+  },
+  // 将看板取消设置为公共看板
+  cancelBoardCommon:params=>{
+    return http.post('/bi_dashborad/public/cancel',params)
+  },
+
+  // 将看板设置为共享看板
+  setBoardShare:params=>{
+    return http.post('/bi_dashborad/grant',params)
+  },
+  // 将看板取消设置为共享看板
+  cancelBoardShare:params=>{
+    return http.post('/bi_dashborad/grant/cancel',params)
+  },
+  //获取看板共享用户
+  getBoardShareUsers:params=>{
+    return http.get('/bi_dashborad/grant/info',params)
+  }
   
 }

src/views/BI_manage/components/BoardContent.vue

@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import apiBiBoard from '@/api/modules/BIBoard.js'
 import TableNoData from '../../../components/tableNoData.vue';
 import ChartBox from './ChartBox.vue';
 import TableBox from './TableBox.vue';
@@ -44,6 +45,7 @@ export default {
       type: Array,
       default: () => []
     },
+    boardInfo:{},//看板详情数据
     canDrag: {//能否拖动
       type: Boolean,
       default: true
@@ -73,15 +75,34 @@ export default {
     dragStart(index) {
       this.draggedIndex = index;
     },
-    drop(index) {
+    async drop(index) {
       if (this.draggedIndex === null) return
       // Swap the two items
       const temp = this.value[this.draggedIndex];
-      this.$set(this.value, this.draggedIndex, this.value[index]);
-      this.$set(this.value, index, temp);
-      this.draggedIndex = null;
-      this.$emit('input',this.value)
-      this.$emit('change',this.value)
+      const fromEl=this.value[this.draggedIndex]
+      const toEl=this.value[index]
+      const params={
+        BiDashboardId:this.boardInfo.BiDashboardId,
+        BiDashboardDetailId:fromEl.BiDashboardDetailId,
+        Sort:this.draggedIndex+1,
+        OtherDetailId:toEl.BiDashboardDetailId,
+        OtherSort:index+1
+      }
+      try {
+        const res=await apiBiBoard.moveBoardElement(params)
+        if(res.Ret!==200){
+          this.draggedIndex=null
+          return
+        }
+        this.$set(this.value, this.draggedIndex, this.value[index]);
+        this.$set(this.value, index, temp);
+        this.draggedIndex = null;
+        this.$emit('input',this.value)
+        this.$emit('change',this.value)
+      } catch (error) {
+        this.draggedIndex=null
+      }
+      
     },
   }
 };

src/views/BI_manage/components/ChartBox.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="chart-box" v-if="compData" ref="compRef" v-loading="loading">
+  <div class="chart-box" v-if="compData" ref="compRef" v-loading="loading" element-loading-text="拼命加载中">
     <div class="top-title-box">
       <div class="title" @click="goDetail">{{ chartInfo.ChartName }}</div>
       <div class="opt-box">

src/views/BI_manage/components/CommonClassify.vue

@@ -10,20 +10,21 @@
     append-to-body
   >
     <div class="common-classify-wrap">
-      <el-button type="text" icon="el-icon-plus" @click="showEdit=true">添加分类</el-button>
+      <el-button type="text" icon="el-icon-plus" @click="showEdit=true;editData=null">添加分类</el-button>
       <div class="classify-list-box">
         <div class="item-box" v-for="item in 10" :key="item">
           <el-input disabled style="flex:1"></el-input>
-          <img class="icon" src="~@/assets/img/icons/edit-blue.png" alt="">
-          <img class="icon" src="~@/assets/img/icons/delete-red.png" alt="">
+          <img class="icon" src="~@/assets/img/icons/edit-blue.png" alt="" @click="handleShowEdit(item)">
+          <img class="icon" src="~@/assets/img/icons/delete-red.png" alt="" @click="handleDelete(item)">
         </div>
       </div>
     </div>
-    <EditCommonClassify v-model="showEdit"/>
+    <EditCommonClassify v-model="showEdit" :editData="editData" @change="handleEditSuccessBack"/>
   </el-dialog>
 </template>
 
 <script>
+import apiBiBoard from '@/api/modules/BIBoard.js'
 import EditCommonClassify from './EditCommonClassify.vue'
 export default {
   name: "CommonClassify",
@@ -38,15 +39,47 @@ export default {
       default: false
     }
   },
+  watch: {
+    show(n){
+      if(n){
+        this.getList()
+      }
+    }
+  },
   data() {
     return {
-      showEdit:false
+      showEdit:false,
+      editData:null,
+
     }
   },
   methods: {
     handleClose() {
       this.$emit('showChange', false)
     },
+
+    handleShowEdit(e){
+      this.editData=e
+      this.showEdit=true
+    },
+
+    async handleDelete(e){
+      const res=await apiBiBoard.deleteCommonClassify({
+        BiDashboardClassifyId:BiDashboardClassifyId.BiDashboardClassifyId
+      })
+      if(res.Ret!==200) return
+      this.handleEditSuccessBack()
+    },
+
+    handleEditSuccessBack(){
+      this.$emit('change')
+      this.getList()
+    },
+
+    async getList(){
+      const res=await apiBiBoard.commonClassifyList()
+      
+    }
   },
 }
 </script>

src/views/BI_manage/components/EditCommonClassify.vue

@@ -40,6 +40,7 @@
 </template>
 
 <script>
+import apiBiBoard from '@/api/modules/BIBoard.js'
 export default {
   name: "EditCommonClassify",
   model: {
@@ -50,6 +51,14 @@ export default {
     show: {
       type: Boolean,
       default: false
+    },
+    editData:null
+  },
+  watch: {
+    show(n){
+      if(n&&this.editData){
+        this.formData.name=this.editData.ClassifyName
+      }
     }
   },
   data() {
@@ -64,10 +73,19 @@ export default {
       this.$emit('showChange', false)
     },
     saveHandle() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-
-        }
+      this.$refs.ruleForm.validate(async(valid) => {
+        if (!valid) return
+        const res=this.editData?await apiBiBoard.editCommonClassify({
+          ClassifyName:this.formData.name,
+          BiDashboardClassifyId:this.editData.BiDashboardClassifyId
+        }) :await apiBiBoard.addCommonClassify({
+          ClassifyName:this.formData.name
+        })
+        if(res.Ret!==200) return
+        this.$message.success('保存成功')
+        this.formData.name=''
+        this.$emit('change')
+        this.handleClose()
       })
     }
   },

src/views/BI_manage/components/SetCommon.vue

@@ -10,32 +10,55 @@
     width="680px"
     @close="handleClose"
   >
-    <div class="BI-share-wrap">
+    <div class="BI-share-wrap" v-if="boardInfo">
       <div class="board-title">
-        <div style="flex:1">看板名称</div>
-        <el-tag size="mini">审批状态</el-tag>
+        <div style="flex: 1">{{boardInfo.BiDashboardName}}</div>
+        <el-tag size="mini" type="warning" v-if="boardInfo.State === 4">待审批</el-tag>
+        <el-tag size="mini" type="danger" v-if="boardInfo.State === 5">已驳回</el-tag>
+        <el-tag size="mini" type="success" v-if="boardInfo.State === 6">已通过</el-tag>
       </div>
-      <el-select placeholder="请选择分类" style="width:100%;margin:20px 0"></el-select>
-      <div class="tips">提示：个人看板设为公共看板，请先选择公共看板分类，提交审批，审批通过后可设置公开！</div>
-      <div class="tips">提示：设置公开看板失败，若要编辑，请先执行撤销操作！<el-button type="text">撤销</el-button></div>
-      <div class="tips">提示：审批通过后，个人看板则设置公开成功！</div>
-      <div class="tips">提示：设置公开看板成功，若要编辑，请先撤销操作（即取消公开）！<el-button type="text">撤销</el-button></div>
-      
+      <el-select
+        v-model="classify"
+        placeholder="请选择分类"
+        style="width: 100%; margin: 20px 0"
+        :disabled="boardInfo.State !== 1"
+      >
+        <el-option v-for="item in list" :key="item.BiDashboardClassifyId" :value="item.BiDashboardClassifyId" :label="item.BiDashboardClassifyName"></el-option>
+      </el-select>
+      <div class="tips" v-if="boardInfo.State === 1">
+        提示：个人看板设为公共看板，请先选择公共看板分类，提交审批，审批通过后可设置公开！
+      </div>
+      <div class="tips" v-if="boardInfo.State === 5">
+        提示：设置公开看板失败，若要编辑，请先执行撤销操作！
+        <el-button type="text" @click="handleBackCommon">撤销</el-button>
+      </div>
+      <div class="tips" v-if="boardInfo.State === 4">
+        提示：审批通过后，个人看板则设置公开成功！
+      </div>
+      <div class="tips" v-if="boardInfo.State === 6">
+        提示：设置公开看板成功，若要编辑，请先撤销操作（即取消公开）！
+        <el-button type="text" @click="handleBackCommon">撤销</el-button>
+      </div>
+
       <div class="dia-bot">
-        <el-button
-          type="primary"
-          plain
-          @click="handleClose"
-          style="margin-right: 20px"
-          >{{ $t("Dialog.cancel_btn") }}</el-button
-        >
-        <el-button type="primary" @click="saveHandle">提交审批</el-button>
+        <template v-if="boardInfo.State === 1">
+          <el-button
+            type="primary"
+            plain
+            @click="handleClose"
+            style="margin-right: 20px"
+            >{{ $t("Dialog.cancel_btn") }}</el-button
+          >
+          <el-button type="primary" @click="saveHandle">提交审批</el-button>
+        </template>
+        <el-button v-else type="primary" @click="handleClose">知道了</el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
+import apiBiBoard from '@/api/modules/BIBoard.js'
 export default {
   name: "setCommon",
   model: {
@@ -46,19 +69,67 @@ export default {
     show: {
       type: Boolean,
       default: false
+    },
+    boardInfo: {},//state 1:未公开; 4-待审批；5-已驳回；6-已通过
+  },
+  watch: {
+    show(n){
+      if(n){
+        this.classify=this.boardInfo.BiDashboardClassifyId||''
+        this.getClassifyList()
+      }
     }
   },
   data() {
     return {
+      list:[],
+      classify:''
     }
   },
   created() {
   },
   methods: {
     handleClose() {
+      this.classify=''
       this.$emit('showChange', false)
     },
-    
+
+    handleBackCommon(){
+      apiBiBoard.cancelBoardCommon({
+        BiDashboardId:this.boardInfo.BiDashboardId,
+      }).then(res=>{
+        if(res.Ret===200){
+          this.$message.success('撤销成功')
+          this.handleClose()
+          this.$emit('change')
+        }
+      })
+    },
+
+    saveHandle(){
+      if(!this.classify){
+        this.$message.warning('请选择分类')
+        return
+      }
+      apiBiBoard.setBoardCommon({
+        BiDashboardId:this.boardInfo.BiDashboardId,
+        ClassifyId:this.classify
+      }).then(res=>{
+        if(res.Ret===200){
+          this.$message.success('提交成功')
+          this.handleClose()
+          this.$emit('change')
+        }
+      })
+    },
+
+    async getClassifyList(){
+      const res=await apiBiBoard.commonClassifyList()
+      if(res.Ret===200){
+        this.list=res.Data||[]
+      }
+    }
+
   },
 }
 </script>
@@ -69,9 +140,8 @@ export default {
   padding: 20px;
   border: 1px dashed #c8cdd9;
 }
-.board-title{
+.board-title {
   display: flex;
-  
 }
 .dia-bot {
   display: flex;

src/views/BI_manage/components/SetShare.vue

@@ -15,10 +15,13 @@
         <span style="color: #0052d9">共享看板</span>
         <el-switch v-model="open"> </el-switch>
         <el-cascader
+          style="width:450px"
+          v-show="open"
           v-model="select_users"
           :options="researcherList"
           :show-all-levels="false"
           filterable
+          collapse-tags
           :props="{
             value: 'ItemId',
             label: 'ItemName',
@@ -29,17 +32,17 @@
           }"
           clearable
           placeholder="选择共享人"
-          :key="cascaderIdx"
-          @remove-tag="removeResearchersChange"
+          ref="selectUserEl"
         />
       </div>
-      <div class="select-user-box">
+      <div class="select-user-box" v-if="open">
         <el-tag
-          v-for="tag in select_users"
-          :key="tag.name"
+          v-for="tag in select_user_names"
+          :key="tag.ItemId"
           closable
+          @close="handleDeleteUser(tag.ItemId)"
         >
-          {{ tag.name }}
+          {{ tag.ItemName }}
         </el-tag>
       </div>
 
@@ -61,6 +64,7 @@
 
 <script>
 import { dataAuthInterface } from '@/api/api.js';
+import apiBiBoard from '@/api/modules/BIBoard.js'
 export default {
   name: "setShare",
   model: {
@@ -71,27 +75,94 @@ export default {
     show: {
       type: Boolean,
       default: false
+    },
+    boardInfo:{}
+  },
+  watch: {
+    select_users(n){
+      if(this.open&&n){
+        this.getSelectUserNames()
+      }
+    },
+    show(n){
+      if(n){
+        this.open=this.boardInfo.IsGrant||false
+        this.getSelectUser()
+      }
     }
   },
   data() {
     return {
       open: false,
-      select_users: [],
+      select_users: '',
       researcherList: [],
-      cascaderIdx: 1
+      select_user_names:[],
     }
   },
   created() {
     this.getSystemUserList()
   },
   methods: {
+    async saveHandle(){
+      if(!this.open){
+        const res=await apiBiBoard.cancelBoardShare({
+          BiDashboardId:this.boardInfo.BiDashboardId
+        })
+        if(res.Ret!==200)return
+        this.$message.success('保存成功')
+        this.handleClose()
+        this.$emit('change')
+        return
+      }
+
+      if(!this.select_users){
+        this.$message.warning('请选择共享人')
+        return
+      }
+      const res=await apiBiBoard.setBoardShare({
+        BiDashboardId:this.boardInfo.BiDashboardId,
+        AdminIdStr:this.select_users.join(',')
+      })
+      if(res.Ret===200){
+        this.$message.success('保存成功')
+        this.handleClose()
+        this.$emit('change')
+      }
+    },
+
+    getSelectUserNames(){
+      this.$nextTick(()=>{
+          const data=this.$refs.selectUserEl.getCheckedNodes()
+          this.select_user_names=data.map(item=>{
+            return item.data
+          })
+        })
+    },
+
+    getSelectUser(){
+      apiBiBoard.getBoardShareUsers({
+        BiDashboardId:this.boardInfo.BiDashboardId
+      }).then(res=>{
+        if(res.Ret===200&&res.Data){
+          this.select_users=res.Data.split(',')
+          this.getSelectUserNames()
+        }
+      })
+    },
+
     handleClose() {
+      this.open=false
+      this.select_users=''
+      this.select_user_names=[]
       this.$emit('showChange', false)
     },
     async getSystemUserList() {
       const res = await dataAuthInterface.userSearch();
       if (res.Ret !== 200) return
       this.researcherList = res.Data || []
+    },
+    handleDeleteUser(val){
+      this.select_users = this.select_users.filter(item => item !== val)
     }
   },
 }
@@ -102,6 +173,9 @@ export default {
   margin-top: 20px;
   padding: 20px;
   border: 1px dashed #c8cdd9;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
 }
 .dia-bot {
   display: flex;

src/views/BI_manage/components/TableBox.vue

@@ -1,22 +1,83 @@
 <template>
-  <div class="table-box" v-if="compData" ref="compRef" v-loading="loading">
+  <div
+    class="table-box"
+    v-if="compData"
+    ref="compRef"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+  >
     <div class="top-title-box">
-      <div class="title">{{ compData.ExcelName }}</div>
+      <div class="title">{{ info&&info.ExcelName }}</div>
       <div class="opt-box">
         <img
           class="icon"
           src="~@/assets/img/icons/refresh_blue_new.png"
           alt=""
+          @click="handleRefresh"
         />
         <slot name="drag"></slot>
         <slot name="delete"></slot>
       </div>
     </div>
-    <img class="bg" :src="compData.ExcelImage" alt="" />
+    <!-- 无权限 -->
+    <div class="nodata" v-if="!info">
+      <noDataAuth text="暂无数据" />
+    </div>
+    <div class="table-render-wrap" v-else>
+    <div class="table-wrapper pc-sty" >
+      <table
+        cellpadding="0"
+        cellspacing="0"
+        :style="`font-size: ${info.Config.FontSize || 12}px`"
+      >
+        <tbody>
+          <tr v-for="(item, index) in info.TableInfo.TableDataList" :key="index">
+            <td
+              :class="[
+                'data-cell',
+                {
+                  'one-bg': (index + 1) % 2 && index > 0,
+                  'tow-bg': (index + 1) % 2 !== 0 && index > 0,
+                  'head-column': index === 0,
+                },
+              ]"
+              v-for="(cell, cell_index) in item"
+              :key="cell_index"
+              :colspan="cell.mc.cs || 1"
+              :rowspan="cell.mc.rs || 1"
+              :style="`
+            color: ${cell.fc};
+            font-weight: ${cell.bl ? 'bold' : 'normal'};
+            font-style: ${cell.it ? 'italic' : 'normal'};
+            background: ${cell.bg};
+          `"
+            >
+              <!-- 单元格拆分 -->
+              <div class="split-word" v-if="cell.ct.s">
+                <span
+                  v-for="(word, word_index) in cell.ct.s"
+                  :key="`${index}_${cell_index}_${word_index}`"
+                  :style="`
+                color: ${word.fc};
+                font-weight: ${word.bl ? 'bold' : 'normal'};
+                font-style: ${word.it ? 'italic' : 'normal'};
+              `"
+                  >{{ word.v }}</span
+                >
+              </div>
+              <div v-else>{{ cell.m }}</div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    </div>
   </div>
 </template>
 
 <script>
+import apiBiBoard from '@/api/modules/BIBoard.js'
+import * as sheetInterface from "@/api/modules/sheetApi.js";
 export default {
   props: {
     compData: null
@@ -24,12 +85,13 @@ export default {
   data() {
     return {
       loading: true,
-      observer:null,
+      observer: null,
       isVisible: false, // 是否可见
+      info:null,
     }
   },
   mounted() {
-    console.log('表格组件挂载', this.compData.ExcelInfoId);
+    console.log('表格组件挂载',);
     this.createObserver();
   },
   beforeUnmount() {
@@ -38,12 +100,25 @@ export default {
     }
   },
   methods: {
+    handleRefresh: _.debounce(async function () {
+      if(this.loading) return
+      this.loading = true
+      const res = await sheetInterface.refreshCustomSheet({
+        ExcelInfoId: this.info.ExcelInfoId,
+      });
+      this.loading=false
+
+      if (res.Ret !== 200) return;
+      this.$message.success(this.$t('ETable.Msg.refresh_success_msg') );
+      this.handleGetTableData()
+    }, 300),
+
     // 获取表格数据
-    handleGetTableData(){
-      setTimeout(() => {
-        console.log('表格组件加载结束', this.compData.ExcelInfoId);
-        this.loading=false
-      }, 2000);
+    async handleGetTableData() {
+      const res = await apiBiBoard.tableDetail({ UniqueCode: this.compData.UniqueCode })
+      this.loading = false
+      if (res.Ret !== 200) return;
+      this.info=res.Data
     },
 
     // 利用判断是否进入可视区域 来加载数据 
@@ -58,7 +133,7 @@ export default {
       this.observer.observe(this.$refs.compRef); // 监听组件
     },
     handleIntersect(entries) {
-      if(this.isVisible) return 
+      if (this.isVisible) return
       entries.forEach(entry => {
         // 判断是否在可视范围内
         if (entry.isIntersecting) {
@@ -79,6 +154,8 @@ export default {
   height: 100%;
   padding: 20px;
   box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
   .top-title-box {
     display: flex;
     margin-bottom: 10px;
@@ -107,9 +184,87 @@ export default {
       }
     }
   }
-  .bg {
-    width: 100%;
-    height: 200px;
+  ::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+::-webkit-scrollbar-track {
+  background: rgb(239, 239, 239);
+  border-radius: 2px;
+}
+::-webkit-scrollbar-thumb {
+  background: #ccc;
+  border-radius: 10px;
+}
+::-webkit-scrollbar-thumb:hover {
+  background: #888;
+}
+::-webkit-scrollbar-corner {
+  background: #666;
+}
+.table-render-wrap{
+  width: 100%;
+  flex: 1;
+  height: 100%;
+  overflow-y: auto;
+}
+.table-wrapper {
+  max-width: calc(100vw - 20px);
+  margin: 0 auto;
+  overflow: auto;
+}
+table {
+  width: 100%;
+  font-size: 14px;
+  color: #333;
+  td,
+  th {
+    // min-width: 120px;
+    word-break: break-all;
+    word-wrap: break-word;
+    line-height: 1.2em;
+    border: 1px solid #dcdfe6;
+    // height: 40px;
+    text-align: center;
+    background-color: #fff;
+    border-left: none;
+    border-top: none;
+    &:first-child {
+			border-left: 1px solid #dcdfe6;
+		}
+  }
+
+  .data-cell{
+    color: #333;
+    &.one-bg {
+      background-color: #EFEEF1;
+    }
+    &.two-bg {
+      background-color: #fff;
+    }
+  }
+
+  .thead-sticky {
+    position: sticky;
+    top: 0;
   }
+
+  .head-column {
+    background-color: #505B78;
+    color: #fff;
+  }
+  .split-word {
+    span { display: inline; }
+  }
+}
+
+.pc-sty table {
+  table-layout: auto;
+  td,th {
+    width: auto;
+    height: auto;
+    padding: 0.4em 0;
+  }
+}
 }
 </style>

src/views/BI_manage/editBoard.vue

@@ -114,7 +114,7 @@ export default {
 
     handleAddComp(type, data) {
       const arr = data || []
-      if (this.boardData.length + arr.length > MAX_COUNT) {
+      if (this.boardDataList.length + arr.length > MAX_COUNT) {
         this.$message.warning('添加已达上限（上限50）！')
         return
       }
@@ -124,7 +124,7 @@ export default {
           UniqueCode:item.UniqueCode,
           BiDashboardDetailId:getUniqueId()
         }
-        this.boardData.push(obj)
+        this.boardDataList.push(obj)
       });
 
       this.showSelectChart = false

src/views/BI_manage/index.vue

@@ -79,20 +79,20 @@
           @click="showSetCommon = true"
           >设置公共</el-button
         >
-        <el-button type="text" @click="showSetShare = true">设置共享</el-button>
-        <el-button type="text" @click="handleGoEdit">编辑</el-button>
-        <el-button type="text" style="color: #f00">删除</el-button>
+        <el-button type="text" @click="showSetShare = true" v-if="navType !== 3&&permissionBtn.isShowBtn('BIBoardPermission','BIBoard_setshare')">设置共享</el-button>
+        <el-button type="text" @click="handleGoEdit" v-if="navType !== 3&&permissionBtn.isShowBtn('BIBoardPermission','BIBoard_edit')">编辑</el-button>
+        <el-button type="text" style="color: #f00" v-if="navType !== 3&&permissionBtn.isShowBtn('BIBoardPermission','BIBoard_delete')&&currentBoardIsSelf">删除</el-button>
       </div>
     </div>
     <!-- 看板内容模块 -->
-    <BIBoardContent v-model="boardDataList" :canDrag="false" />
+    <BIBoardContent v-model="boardDataList" :boardInfo="boardInfo"/>
 
     <!-- 设置共享 -->
-    <set-share v-model="showSetShare" />
+    <set-share v-model="showSetShare" :boardInfo="boardInfo" @change="handleSetShareBack"/>
     <!-- 设置公共 -->
-    <SetCommon v-model="showSetCommon" />
+    <SetCommon v-model="showSetCommon" :boardInfo="boardInfo" @change="handleSetCommonBack"/>
     <!-- 公共看板分类 -->
-    <CommonClassify v-model="showCommonClassify" />
+    <CommonClassify v-model="showCommonClassify" @change="getCommonBoardList('update')"/>
   </div>
 </template>
 
@@ -105,6 +105,13 @@ import SetShare from './components/SetShare.vue'
 
 export default {
   components: { BIBoardContent, SetShare, SetCommon, CommonClassify },
+  computed: {
+    currentBoardIsSelf(){//判断当前看板是否为当前用户创建的
+      if(!this.boardInfo) return false
+      const localAdminId=localStorage.getItem('AdminId')
+      return localAdminId==this.boardInfo.SysAdminId
+    }
+  },
   data() {
     return {
       navType: 1,// 
@@ -146,10 +153,27 @@ export default {
       if (res.Ret === 200) {
         this.boardInfo = res.Data
         this.boardDataList = res.Data.List || []
-        console.log(this.permissionBtn);
       }
     },
 
+    // 设置公共回调
+    handleSetCommonBack(){
+      this.getBoardDetail()
+    },
+
+    // 设置共享回调
+    handleSetShareBack(){
+      if(this.navType===1){
+        this.getBoardDetail()
+        return
+      }
+      if(this.navType===2){
+        this.getShareBoardList()
+        return
+      }
+      
+    },
+
     // 我的看板列表
     async getMyBoardList() {
       const res = await apiBiBoard.myBoardList()
@@ -198,10 +222,12 @@ export default {
     },
 
     // 公共看板列表
-    async getCommonBoardList() {
+    async getCommonBoardList(type) {
       const res = await apiBiBoard.commonBoardList()
       if (res.Ret === 200) {
         this.commonBoardList = res.Data || []
+        // 编辑了分类回调 不更新选择的看板仅仅更新公共看板列表数据
+        if(type==='update') return
         if (this.commonBoardList.length > 0) {
           this.selectBoardId = this.commonBoardList[0].BiDashboardId
         }