Merge branch 'master' into ETA1.9.7

src/api/modules/sheetApi.js

@@ -492,5 +492,48 @@ export const sheetAnalysisInterface = {
 	 */
 	checkSheetRepeat: params => {
 		return http.get('/custom_analysis/excel_by_name',params)
-	}
+	},
+	/**
+	 * 全分类列表
+	 * @param {Object} params
+	 * @param {Boolean} params.IsShare 是否是共享列表
+	 * @returns 
+	 */
+	getSheetTreeList:params=>{
+		return http.get('/custom_analysis/excel_classify/list',params)
+	},
+	/**
+	 * 搜索和分类列表
+	 * @param {Object} params 
+	 * @param {Number} params.PageSize
+	 * @param {Number} params.CurrentIndex
+	 * @param {Number} params.ExcelClassifyId
+	 * @param {String} params.Keyword
+	 * @param {String} params.IsShare
+	 * @returns 
+	 */
+	getSheetList:params=>{
+		return http.get('/custom_analysis/excel/list',params)
+	},
+	/**
+	 * 设置表格分享
+	 * @param {Object} params 
+	 * @param {Number} params.ExcelInfoId
+	 * @param {Number[]} params.ViewUserIds
+	 * @param {Number[]} params.EditUserIds
+	 * @returns 
+	 */
+	setSheetShare:params=>{
+		return http.post('/custom_analysis/excel/share',params)
+	},
+	/**
+	 * 获取表格分享详情
+	 * @param {Object} params 
+	 * @param {Number} params.ExcelInfoId
+	 * @returns 
+	 */
+	getSheetShareDetail:params=>{
+		return http.get('/custom_analysis/excel/share_detail',params)
+	},
+
 }

src/lang/modules/ETATables/En.js

@@ -121,6 +121,20 @@ export default {
     rules_unit: "Unit cannot be empty",
     date_sequence_cannot_msg: "The date sequence cannot be empty",
     numerical_sequence_cannot_msg: "The numerical sequence cannot be empty",
+
+    table_my:'My Table',
+    table_share:'Shared Table',
+    share_btn:'Share Settings',
+    cancel_share_btn:'Cancel Sharing',
+    share_user_btn:'Select User',
+    share_success_msg:'Set Successful',
+    cancel_share_success_msg:'Cancellation Successful',
+    cancel_share_hint:'Confirm to cancel the share?',
+    share_set_user:'Select Sharing User',
+    shart_user:'Sharing User',
+    share_check_text:'Viewable',
+    share_edit_text:'Editable',
+    share_set_hint:'Please select shared user permissions',
   },
 
   ETableChildren: {

src/lang/modules/ETATables/Zh.js

@@ -121,6 +121,20 @@ export default {
     rules_unit: "单位不能为空",
     date_sequence_cannot_msg: "日期序列不能为空",
     numerical_sequence_cannot_msg: "数值序列不能为空",
+
+    table_my:'我的表格',
+    table_share:'共享表格',
+    share_btn:'设置共享',
+    cancel_share_btn:'取消共享',
+    share_user_btn:'选择用户',
+    share_success_msg:'设置共享成功',
+    cancel_share_success_msg:'取消共享成功',
+    cancel_share_hint:'是否确认取消共享?',
+    share_set_user:'设置共享用户',
+    shart_user:'共享用户',
+    share_check_text:'可查看权限',
+    share_edit_text:'可编辑权限',
+    share_set_hint:'未选择用户,请检查',
   },
 
   ETableChildren: {

src/lang/modules/Slides/pptPresent.js

@@ -53,7 +53,7 @@ export const presentEn = {
   please_fill_title_msg: "Please fill in PPT title",
   merging_successful_msg: " Merging successful",
   shared_users_lable: "Shared users",
-  ficc_researchers_radio: "All FICC researchers",
+  all_users_radio: "All Users",
   specify_members_radio: "Specify members",
   please_select_researcher: "Please select a researcher",
   please_select_directory: "Please select a directory",
@@ -160,7 +160,7 @@ export const presentZh = {
   please_fill_title_msg: "请填写PPT标题",
   merging_successful_msg: " 合并成功",
   shared_users_lable: "共享用户",
-  ficc_researchers_radio: "全部ficc研究员",
+  all_users_radio: "全部用户",
   specify_members_radio: "指定成员",
   please_select_researcher: "请选择研究员",
   please_select_directory_msg: "请选择目录",

src/utils/buttonConfig.js

@@ -493,6 +493,7 @@ export const etaTablePermission = {
     etaTable_analysis_del:'etaTable:analysis:del',//删除
     etaTable_analysis_save:'etaTable:analysis:save',//保存
     etaTable_analysis_edit:'etaTable:analysis:edit',//编辑
+    etaTable_analysis_share:'etaTable:analysis:share',//设置共享，取消共享
 
     // 平衡表
     etaTable_customize_balance_sheetAdd:'etaTable:customize:balance:sheetAdd',//添加
@@ -825,6 +826,8 @@ export const approvePermission = {
     reportApprove_rejectreason:'reportApprove:rejectreason',//驳回理由(列表中的按钮)
     reportApprove_return:'reportApprove:return',//返回(审批详情-返回按钮)
     reportApprove_repeal:'reportApprove:repeal',//撤回(列表中的按钮,审批详情-撤回按钮)
+    reportApprove_download_pdf:'reportApprove:download:pdf',//下载PDF
+    reportApprove_download_img:'reportApprove:download:img',//下载长图
 }
 
 /* 图表主题配置 */

src/views/approve_manage/approveList.vue

@@ -87,6 +87,9 @@
                                 <el-button type="text" style="padding:0;" @click="toApproveDetail(row,'detail')">{{$t('AprrovalPage.details_table')}}</el-button>
                                 <el-button type="text" style="padding:0" @click="handleShowDetail(row)" 
                                     v-if="row.State===3&&permissionBtn.isShowBtn('approvePermission','reportApprove_rejectreason')">{{$t('AprrovalPage.rejection_table')}}</el-button>
+                                <!-- 下载长图 下载pdf按钮 -->
+                                <el-button type="text" style="padding:0" v-if="row.DetailPdfUrl&&permissionBtn.isShowBtn('approvePermission','reportApprove_download_pdf')" @click="downloadPdfImg(row,1)">{{$t('ReportManage.smart_btn.download_pdf')}}</el-button>
+                                <el-button type="text" style="padding:0" v-if="row.DetailImgUrl&&permissionBtn.isShowBtn('approvePermission','reportApprove_download_img')" @click="downloadPdfImg(row,2)">{{$t('ReportManage.smart_btn.download_long_image')}}</el-button>
                             </template>
                             <template v-if="activeTab==='originate'">
                                 <el-button type="text" style="padding:0;" @click="toApproveDetail(row,'myself')">{{$t('AprrovalPage.details_table')}}</el-button>
@@ -263,6 +266,13 @@ export default {
             if(e==='待审批') return this.$t('AprrovalPage.awaiting_approval_option') 
             if(e==='已同意') return this.$t('AprrovalPage.agreed_option') 
             return e
+        },
+        downloadPdfImg(row,type){
+            if(type == 1){
+                row.DetailPdfUrl&&window.open(row.DetailPdfUrl,"_blank")
+            }else{
+                row.DetailImgUrl&&this.handleDownloadResource(row.DetailImgUrl,`${row.ReportTitle}`)
+            }
         }
     },
     mounted(){

src/views/dataEntry_manage/chartSetting.vue

@@ -1884,16 +1884,9 @@ export default {
       }
 
       const { EdbInfoList } = res.Data;
-
-      this.tableData.forEach((item) => {
-        let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
-        item.DataList = edbData.DataList;
-        //更新起始时间和最近更新时间
-        item.StartDate = edbData.StartDate;
-        item.ModifyTime = edbData.ModifyTime;
-
-        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
-      });
+      
+      //更新表格数据
+      this.tableData = _.cloneDeep(EdbInfoList);
     },
 
     /* 搜索 */
@@ -2170,34 +2163,7 @@ export default {
         })
         .catch(() => {});
     },
-    /* 图表未保存时更新图表数据 */
-    refreshTarget() {
-      for (let i in this.tableData) {
-        let params = {
-          EdbInfoId: this.tableData[i].EdbInfoId,
-          DateType: this.year_select,
-          StartDate:
-            this.year_select === 5 || this.year_select === 6
-              ? this.select_date[0]
-              : '',
-          EndDate: this.year_select === 5 ? this.select_date[1] : '',
-          EdbInfoType: this.tableData[i].EdbInfoType,
-          LeadValue: this.tableData[i].EdbInfoType
-            ? 0
-            : this.tableData[i].LeadValue,
-          LeadUnit: this.tableData[i].EdbInfoType
-            ? ''
-            : this.tableData[i].LeadUnit,
-        };
-        dataBaseInterface.edbinfoDetail(params).then((res) => {
-          if (res.Ret === 200) {
-            let newData = res.Data.EdbInfo;
-            this.tableData[i].DataList = newData.DataList;
-            if(newData.EdbInfoCategoryType===1) this.tableData[i].MoveLatestDate = newData.MoveLatestDate;
-          }
-        });
-      }
-    },
+
     /* 年份改变 重新刷新图表接口  保存当前的图表配置和上下限 只改变图表 */
     changeYear(item) {
       this.year_select = item.value;

src/views/dataEntry_manage/databaseList.vue

@@ -1455,6 +1455,8 @@ export default {
 
 						this.page_no = 1;
 						this.getDataList('refresh')
+						
+						this.$refs.createChart && this.$refs.createChart.getDataByPath()
 					}else{
 						this.loading.close();
 					}

src/views/datasheet_manage/components/sheetListWrap.vue

@@ -22,6 +22,13 @@
           <div class="item-bottom">
             <span>{{$t('OnlineExcelPage.creation_time_tle')}}: {{ cell.CreateTime.slice(0, 10) }}</span>
             <div>
+                <span v-if="cell.Source===4&&$parent.isSheetBtnShow('otherSave')&&cell.HaveOperaAuth"
+                    class="editsty"
+                    style="margin-right: 10px"
+                    @click="$emit('saveOther',cell)"
+                >
+                    {{ $t('ETable.Btn.save_as') }}
+                </span>
               <span
                 v-if="$parent.isSheetBtnShow('download')&&cell.HaveOperaAuth"
                 class="editsty"

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -133,12 +133,26 @@ export default {
 
     /* 获取分类 */
     getClassify() {
-      sheetInterface.excelClassifyOne({Source: 4}).then(res => {
+        sheetInterface.sheetAnalysisInterface.getSheetTreeList({IsShare:false}).then((res) => {
         if(res.Ret !==200) return
-        
-        this.classifyArr = res.Data.AllNodes || [];
+        this.classifyArr = this.formatTreeData(_.cloneDeep(res.Data.AllNodes || []))
+
       })
     },
+    formatTreeData(tree){
+        function dfs(node){
+            if (Array.isArray(node.Children)) {
+                node.Children = node.Children.filter(dfs)
+                if(node.Children.length===0) delete node.Children
+            }
+            
+            if(node.ExcelInfoId) {
+                return null
+            }
+            return node
+        }
+        return tree.filter(dfs)
+    },
 
     loadDataSync() {
       let len = this.sheetConfig.data.length;

src/views/datasheet_manage/customAnalysis/components/shareTableDia.vue

@@ -0,0 +1,262 @@
+<template>
+    <!--  表格设置共享-->
+    <div class="share-table-dialog">
+        <el-dialog
+            :visible.sync="isOpenDialog"
+            :close-on-click-modal="false"
+            :modal-append-to-body='false'
+            :title="$t('CustomAnalysisPage.share_set_user')"
+            @close="$emit('close')"
+            width="760px"
+        >
+            <div class="container">
+                <div class="share-right-box" v-for="(item,index) in [$t('CustomAnalysisPage.share_check_text'),$t('CustomAnalysisPage.share_edit_text')]" :key="index">
+                    <div class="item-header">
+                        <span @click="shareDataList[index].isExpand=!shareDataList[index].isExpand">
+                            <i :class="shareDataList[index].isExpand?'el-icon-caret-bottom':'el-icon-caret-right'"></i>
+                            {{ item }}
+                        </span>
+                    </div>
+                    <div class="select-wrap" v-show="shareDataList[index].isExpand">
+                        <div class="select-box">
+                            <span>{{$t('CustomAnalysisPage.shart_user')}}</span>
+                            <el-cascader
+                                :ref="`user_select_${index}`"
+                                v-model="shareDataList[index].selectList"
+                                :options="shareDataList[index].userList"
+                                :show-all-levels="false"
+                                :key="shareDataList[index].selectKey"
+                                :placeholder="$t('SupplyAnalysis.StockPlant.placeholder03')"
+                                filterable
+                                :props="{
+                                    value:'NodeId',
+                                    label:'NodeName',
+                                    children:'Children',
+                                    emitPath: false,
+                                    multiple: true
+                                }"
+                                collapse-tags
+                                @change="selectListChange(index)"
+                            >
+                            </el-cascader>
+                        </div>
+                        <div class="list-box">
+                            <div class="list-item" v-for="item in shareDataList[index].selectShowList" :key="item.userId">
+                                {{ item.label }}
+                                <span class="close-btn" @click.stop="cancelSelectUser(index,item)">
+                                    <i class="el-icon-error"></i>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="dia-bot" slot="footer" style="text-align:center;">
+                <el-button type="primary" style="margin-right:20px" @click="saveHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+                <el-button type="primary" plain @click="$emit('close')">{{$t('Dialog.cancel_btn')}}</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { departInterence } from "@/api/api.js";
+import * as sheetInterface from "@/api/modules/sheetApi.js";
+export default {
+    props:{
+        isOpenDialog:{
+            type:Boolean,
+            default:false
+        },
+        tableInfo:{ //table的标识 sheetId?
+            type:Object
+        }
+    },
+    watch:{
+        async isOpenDialog(newval){
+            if(newval){
+                await this.getUserList()
+                this.getTableInfo()
+            }
+        }
+    },
+    data() {
+        return {
+            shareDataList:[
+                {
+                    isExpand:true,
+                    selectList:[],//选择的用户id 
+                    selectShowList:[],//选择的用户
+                    userList:[],//用户列表
+                    selectKey:0,
+                },//可查看
+                {
+                    isExpand:true,
+                    selectList:[]
+                },//可编辑
+            ],
+            userList:[],
+
+        };
+    },
+    methods: {
+        async getUserList(){
+            await departInterence.getSystemUser({
+                KeyWord: ''
+            }).then(res => {
+                if(res.Ret !== 200) return 
+                this.userList = res.Data||[]
+                //去掉Children为空的属性,非用户的叶子节点禁止选中
+                this.formatTreeData({Children:this.userList})
+                this.shareDataList[0].userList = _.cloneDeep(this.userList)
+                this.shareDataList[1].userList = _.cloneDeep(this.userList)
+            })
+        },
+        //遍历树形结构,处理children
+        formatTreeData(tree){
+            function dfs(node) {
+                if (Array.isArray(node.Children)) {
+                    for (let child of node.Children) {
+                        dfs(child); // 递归调用 DFS 函数处理子节点
+                    }
+                    if(node.Children.length===0) delete node.Children
+                }
+                //若为叶子节点,且不为用户,禁止选中
+                if(!node.Children||!Array.isArray(node.Children)){
+                    if(node.NodeType!==3) node.disabled = true
+                }
+            }
+            dfs(tree); 
+        },
+        //将指定节点设置为disabled
+        setListDisabled(arr,nodes){
+            function dfs(node){
+                if (Array.isArray(node.Children)) {
+                    for (let child of node.Children) {
+                        dfs(child); // 递归调用 DFS 函数处理子节点
+                    }
+                }
+                if(arr.includes(node.NodeId)){
+                    node.disabled = true
+                }
+            }
+            dfs({Children:nodes})
+        },
+        //获取表格权限列表
+        getTableInfo(){
+            sheetInterface.sheetAnalysisInterface.getSheetShareDetail({
+                ExcelInfoId:this.tableInfo.ExcelInfoId
+            }).then(res=>{
+                const {ViewUserIds=[],EditUserIds=[]} = res.Data||{}
+                this.shareDataList[0].selectList = ViewUserIds||[]
+                this.shareDataList[1].selectList = EditUserIds||[]
+                //设置选中状态
+                this.selectListChange(0)
+                this.selectListChange(1)
+            })
+        },
+        //筛选框选中变化
+        selectListChange(index){
+            //nextTick获取最新的选中状态
+            this.$nextTick(()=>{
+                const nodes = this.$refs[`user_select_${index}`][0].getCheckedNodes(true)
+                this.shareDataList[index].selectShowList = nodes.map(i=>{
+                    return {
+                        label:i.label,
+                        userId:i.value
+                    }
+                })
+                //将另一个筛选框对应用户置为禁止选中
+                const otherIndex = index===0?1:0
+                //先清除上次选中
+                this.shareDataList[otherIndex].userList = _.cloneDeep(this.userList)
+                this.setListDisabled(nodes.map(i=>i.value),this.shareDataList[otherIndex].userList)
+            })
+        },
+        //取消选择
+        cancelSelectUser(index,user){
+            const selectIndex = this.shareDataList[index].selectList.findIndex(i=>i===user.userId)
+            selectIndex!==-1&&this.shareDataList[index].selectList.splice(selectIndex,1)
+            this.shareDataList[index].selectKey++
+            this.$nextTick(()=>{
+                this.selectListChange(index)
+            })
+        },
+        saveHandle(){
+            //两个都没选,提示
+            const {selectList:checkList=[]} = this.shareDataList[0]
+            const {selectList:editList=[]} = this.shareDataList[1]
+            if(!checkList.length&&!editList.length){
+                return this.$message.warning(/* '未选择用户,请检查' */ this.$t('CustomAnalysisPage.share_set_hint'))
+            }
+            sheetInterface.sheetAnalysisInterface.setSheetShare({
+                ExcelInfoId:this.tableInfo.ExcelInfoId,
+                ViewUserIds:checkList,
+                EditUserIds:editList
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success(`设置共享成功`)
+                this.$emit('setShare')
+            })
+        },
+    },
+};
+</script>
+
+<style lang="scss">
+.share-table-dialog{
+    .el-icon-caret-right:before{
+        content: "\E791" !important;
+    }
+    .el-cascader .el-input{
+        width:100%;
+    }
+}
+</style>
+<style scoped lang="scss">
+.share-table-dialog{
+    .container{
+        margin-left:25px;
+        .share-right-box{
+            margin-bottom:20px;
+            .item-header{
+                cursor:pointer;
+            }
+            .select-wrap{
+                .select-box{
+                    margin-top:10px;
+                    span{
+                        display:inline-block;
+                        width:80px;
+                        text-align:right;
+                        margin-right:15px;
+                    }
+                }
+                .list-box{
+                    margin-top:10px;
+                    margin-left:95px;
+                    display:flex;
+                    flex-wrap: wrap;
+                    gap:15px;
+                    max-height: 200px;
+                    overflow-y: auto;
+                    .list-item{
+                        cursor:pointer;
+                        display:flex;
+                        align-items:center;
+                        padding:5px;
+                        background-color:#D9D9D9;
+                        border-radius:4px;
+                        .close-btn{
+                            margin-left:5px;
+                            &:hover{
+
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+</style>

src/views/datasheet_manage/customAnalysis/list.vue

@@ -19,8 +19,8 @@
             v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_analysis_upload)"
           >{{$t('CustomAnalysisPage.up_file_btn')}}</el-button>
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
-          
-          <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox>
+          <!-- 只看我的 -->
+          <!-- <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox> -->
         </div>
         <div class="search-cont">
           <el-select
@@ -54,6 +54,16 @@
             </el-option>
           </el-select>
         </div>
+        <ul class="left-tab">
+          <li
+            :class="['tab', { act: classify_tab === index }]"
+            v-for="(tab, index) in [$t('CustomAnalysisPage.table_my'), $t('CustomAnalysisPage.table_share')]"
+            :key="tab"
+            @click="changeTab(index)"
+          >
+            {{ tab }}
+          </li>
+        </ul>
         <div class="tree-cont">
           <el-tree
             ref="treeRef"
@@ -65,7 +75,7 @@
             :allow-drop="canDropHandle"
             :current-node-key="select_node"
             :default-expanded-keys="defaultShowNodes"
-            draggable
+            :draggable="classify_tab!==1"
             :expand-on-click-node="false"
             check-strictly
             :empty-text="$t('Common.no_classify_msg')"
@@ -84,7 +94,7 @@
                 :placeholder="$t('OnlineExcelPage.please_value_ipt')"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')"
+                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')&&classify_tab!==1"
                 @blur="changeValue(data)"
               />
               <span
@@ -112,21 +122,22 @@
                   src="~@/assets/img/data_m/move_ico.png"
                   alt=""
                   style="width: 14px; height: 14px; margin-right: 8px"
+                  v-if="classify_tab!==1"
+                />
+                 <!-- 目录操作：添加/编辑/删除 -->
+                <img
+                    src="~@/assets/img/set_m/add.png"
+                    alt=""
+                    style="width: 14px; height: 14px; margin-right: 8px"
+                    @click.stop="addNode(node,data)"
+                    v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&node.level<3&&classify_tab!==1"
                 />
-                 <!-- 添加子 -->
-								<img
-									src="~@/assets/img/set_m/add.png"
-									alt=""
-									style="width: 14px; height: 14px; margin-right: 8px"
-									@click.stop="addNode(node,data)"
-									v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&node.level<3"
-								/>
                 <img
                   src="~@/assets/img/set_m/edit.png"
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')&&classify_tab!==1"
                 />
                 <img
                   slot="reference"
@@ -134,8 +145,30 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')&&classify_tab!==1"
                 />
+                <!-- 表格操作：共享/取消共享 -->
+                <span v-if="data.ExcelInfoId&&data.ShowShareBtn&&isSheetBtnShow('share')">
+                    <el-dropdown @command="handleShareCommand">
+                        <i class="el-icon-share" style="color:#5cb6ff;"></i>
+                        <el-dropdown-menu slot="dropdown">
+                            <!-- 表格为已共享，有取消共享按钮 -->
+                            <el-dropdown-item v-if="(classify_tab===1||data.HasShare)"
+                                :command="{key:'cancel',item:data}"
+                                class="treenode-dropdown-item"
+                                :class="data.isShare===0?'treenode-dropdown-item-act':''" 
+                            >
+                                {{$t('CustomAnalysisPage.cancel_share_btn')}}
+                            </el-dropdown-item>
+                            <el-dropdown-item :command="{key:'share',item:data}"
+                                class="treenode-dropdown-item"
+                                :class="data.isShare===1?'treenode-dropdown-item-act':''" 
+                            >
+                                {{classify_tab?$t('CustomAnalysisPage.share_user_btn'):$t('CustomAnalysisPage.share_btn')}}
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                </span>
               </span>
             </span>
           </el-tree>
@@ -180,61 +213,63 @@
                 @blur="changeValue(sheetDetailInfo, 'edit-tit')"
               />
               <div class="sheet-name"
-                @click="editNodeLabel(sheetDetailInfo, 'edit-tit')"
+                @click="()=>{sheetDetailInfo.Button.OpButton&&editNodeLabel(sheetDetailInfo, 'edit-tit')}"
                 v-else>
                 {{ sheetDetailInfo.ExcelName }}
-                <i class="el-icon-edit"/>
+                <i class="el-icon-edit" v-if="sheetDetailInfo.Button.OpButton"/>
               </div>
               <div class="sheet-anothor-info">
                 <span class="author">{{$t('OnlineExcelPage.author_info')}}{{ sheetDetailInfo.SysUserRealName }}</span>
                 <ul class="action-ul" v-if="sheetDetailInfo.Button">
                   <li style="color:#999999 ;">{{$t('OnlineExcelPage.recent_save_time_info')}}{{ saveTime }}</li>
-                  <el-tooltip effect="dark" :content="$t('CustomAnalysisPage.up_save_tooltip')" placement="top-start">
-                      <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">
-                        <img src="~@/assets/img/icons/choose_bluebg_new.png"/>
-                        <span>{{$t('CustomAnalysisPage.generate_indicators_btn')}}</span>
-                      </li>
-                  </el-tooltip>
-
-                  <el-tooltip effect="dark" :content="$t('CustomAnalysisPage.up_save_tooltip')" placement="top-start">
-                      <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">
-                        <img src="~@/assets/img/icons/refresh_blue_new.png"/>
-                        <span>{{ isEdbReFreshLoading? $t('CustomAnalysisPage.refreshing_loading'):$t('CustomAnalysisPage.refresh_loading')}}</span>
-                      </li>
-                  </el-tooltip>
-                  <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">
-                    <img src="~@/assets/img/icons/save_blue_new.png"/>
-                    <span>{{$t('ETable.Btn.save_btn')}}</span>
-                  </li>
-                  <!-- <li
-                    class="editsty"
-                    @click="goEdit"
-                    v-if="(sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
-                  >
-                    <img src="~@/assets/img/icons/edit_blue_new.png" v-if="!editButtonText"/>
-                    <span>{{ editButtonText?editButtonText:'编辑' }}</span> 
-                  </li> -->
-                  <li
-                    class="editsty"
-                    @click="saveOtherHandle"
-                    v-if="isSheetBtnShow('otherSave')&&sheetDetailInfo.Button.CopyButton"
-                  >
-                    <img src="~@/assets/img/icons/save_as_blue_new.png"/>
-                    <span>{{$t('ETable.Btn.save_as')}}</span>
-                  </li>
-                  <li class="editsty" @click="downloadExcel
-                  (sheetDetailInfo)" v-if="isSheetBtnShow('download')&&sheetDetailInfo.Button.DownloadButton">
-                    <img src="~@/assets/img/icons/download_blue.png"/>
-                    <span>{{$t('ETable.Btn.download_btn')}}</span>
-                  </li>
-                  <li
-                    class="deletesty"
-                    v-if="(isSheetBtnShow('del')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.DeleteButton)"
-                    @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
-                  >
-                    <img src="~@/assets/img/icons/delete-red.png"/>
-                    <span>{{$t('ETable.Btn.delete_btn')}}</span>
-                  </li>
+                  <template v-if="!editButtonText">
+                        <el-tooltip effect="dark" :content="$t('CustomAnalysisPage.up_save_tooltip')" placement="top-start">
+                            <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">
+                                <img src="~@/assets/img/icons/choose_bluebg_new.png"/>
+                                <span>{{$t('CustomAnalysisPage.generate_indicators_btn')}}</span>
+                            </li>
+                        </el-tooltip>
+                        <el-tooltip effect="dark" :content="$t('CustomAnalysisPage.up_save_tooltip')" placement="top-start">
+                            <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">
+                                <img src="~@/assets/img/icons/refresh_blue_new.png"/>
+                                <span>{{ isEdbReFreshLoading? $t('CustomAnalysisPage.refreshing_loading'):$t('CustomAnalysisPage.refresh_loading')}}</span>
+                            </li>
+                        </el-tooltip>
+                        <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">
+                            <img src="~@/assets/img/icons/save_blue_new.png"/>
+                            <span>{{$t('ETable.Btn.save_btn')}}</span>
+                        </li>
+                        <!-- <li
+                            class="editsty"
+                            @click="goEdit"
+                            v-if="(sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
+                        >
+                            <img src="~@/assets/img/icons/edit_blue_new.png" v-if="!editButtonText"/>
+                            <span>{{ editButtonText?editButtonText:'编辑' }}</span> 
+                        </li> -->
+                        <li
+                            class="editsty"
+                            @click="saveOtherHandle(null)"
+                            v-if="isSheetBtnShow('otherSave')&&sheetDetailInfo.Button.CopyButton"
+                        >
+                            <img src="~@/assets/img/icons/save_as_blue_new.png"/>
+                            <span>{{$t('ETable.Btn.save_as')}}</span>
+                        </li>
+                        <li class="editsty" @click="downloadExcel
+                        (sheetDetailInfo)" v-if="isSheetBtnShow('download')&&sheetDetailInfo.Button.DownloadButton">
+                            <img src="~@/assets/img/icons/download_blue.png"/>
+                            <span>{{$t('ETable.Btn.download_btn')}}</span>
+                        </li>
+                        <li
+                            class="deletesty"
+                            v-if="(isSheetBtnShow('del')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.DeleteButton)"
+                            @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
+                        >
+                            <img src="~@/assets/img/icons/delete-red.png"/>
+                            <span>{{$t('ETable.Btn.delete_btn')}}</span>
+                        </li>
+                  </template>
+                  <li v-else>{{ editButtonText }}</li>
                 </ul>
               </div>
             </div>
@@ -245,6 +280,7 @@
                 ref="sheetRef"
                 v-if="sheetConfigOpt.data"
                 :option="sheetConfigOpt"
+                :limit="limit"
                 @updated="hasChange=true"
               />
             </div>
@@ -262,6 +298,7 @@
           @detailShowHandle="detailShowHandle"
           @delSheetHandle="delSheetHandle"
           @downloadExcel="downloadExcel"
+          @saveOther="saveOtherHandle"
           ref="sheetListWrap"
         />
       </div>
@@ -309,6 +346,7 @@
                 value: 'ExcelClassifyId',
                 children: 'Children',
                 emitPath: false,
+                checkStrictly:true
               }"
               style="width: 80%"
               :placeholder="$t('OnlineExcelPage.select_appropriate_category_lable')"
@@ -329,6 +367,13 @@
         >
       </div>
     </m-dialog>
+    <!-- 设置共享弹窗 -->
+    <shareTableDia
+        :isOpenDialog="isShowShareDia"
+        :tableInfo="currentTable"
+        @close="isShowShareDia=false"
+        @setShare="isShowShareDia=false;getTreeData();"
+    />
   </div>
 </template>
 
@@ -337,13 +382,20 @@ import * as sheetInterface from "@/api/modules/sheetApi.js";
 import leftMixin from "../mixins/classifyMixin";
 import mDialog from "@/components/mDialog.vue";
 import classifyDia from "../components/sheetClassifyDia.vue";
+import shareTableDia from "./components/shareTableDia"
 import Sheet from "../components/SheetExcel.vue";
 import { getSheetImage } from "../common/option";
 import sheetListWrap from "../components/sheetListWrap.vue"
 export default {
   name: "",
-  components: { mDialog, classifyDia, Sheet, sheetListWrap },
+  components: { mDialog, classifyDia, Sheet, sheetListWrap, shareTableDia },
   mixins: [leftMixin],
+  beforeRouteLeave(to,from,next){
+    if(from.path=='/sheetAnalysisList'){
+      this.markFinishStatus(this.select_id)
+    }
+    next()
+  },
   computed: {
     downExcelFileUrl() {
       let url = `${
@@ -351,14 +403,6 @@ export default {
       }/datamanage/excel_info/table/download?${localStorage.getItem("auth")}`;
       return url;
     },
-    classifyOptions() {
-      let options = this.treeData.map((_) => ({
-        ExcelClassifyId: _.ExcelClassifyId,
-        ExcelClassifyName: _.ExcelClassifyName,
-      }));
-
-      return options;
-    },
     saveOtherFormRule(){
       return {
         name: [
@@ -430,6 +474,15 @@ export default {
       isEdbReFreshLoading: false,//指标刷新
       // 内容是否更新
       hasChange:false,
+
+      classify_tab:0,//tab栏选中的项
+      isShowShareDia:false,
+      limit:{
+        disabled:true
+      },
+      editButtonText:"",
+      currentTable:{},
+      classifyOptions:[]
     };
   },
   watch: {
@@ -441,13 +494,14 @@ export default {
       });
     },
     /* 表格id */
-    select_id(newval) {
+    select_id(newval,oldval) {
       this.sheetDataPage = 2,
       this.sheetAllcellData = [],//全部单元格数据 分页push
       this.dataToalPage = 0;
       this.sheetConfigOpt.data = null;
       this.hasChange=false
       newval && this.getDetailHandle();
+      this.markFinishStatus(oldval)
     },
 
     select_classify(newval) {
@@ -478,15 +532,96 @@ export default {
     },
   },
   methods: {
-
+    formatTreeData(tree){
+        function dfs(node){
+            if (Array.isArray(node.Children)) {
+                node.Children = node.Children.filter(dfs)
+                if(node.Children.length===0) delete node.Children
+            }
+            
+            if(node.ExcelInfoId) {
+                return null
+            }
+            return node
+        }
+        return tree.filter(dfs)
+    },
+    unloadMark(){
+        if(!this.select_id)return
+
+        let url = process.env.VUE_APP_API_ROOT + "/datamanage/excel_info/mark"
+        let params={ExcelInfoId: this.select_id,Status:2}
+        const uuid = localStorage.getItem("uuid") || "";
+        fetch(url, {
+        method: 'POST',
+        headers:{
+            Authorization:localStorage.getItem("auth"),
+            Uuid:uuid,
+            AccessToken:uuid + "--zheshiyigename"
+        },
+        body:JSON.stringify(params),
+        // 保持连接 让请求不会因为页面关闭而中断
+        keepalive: true
+        });
+    },
+    //取消标记表格的编辑状态
+    markFinishStatus(sheet_id){
+        if(!sheet_id)return
+        sheetInterface.markSheetEditStatus({ExcelInfoId: sheet_id,Status:2}).then(res=>{
+            if(res.Ret!==200) return
+        })
+    },
+    //标记表格的编辑状态
+    goEditHandle(){
+        sheetInterface.markSheetEditStatus({ExcelInfoId: this.select_id,Status:1}).then(res=>{
+            if(res.Ret!==200) return
+        })
+    },
+    //切换表格tab
+    changeTab(index){
+        this.classify_tab = index
+        this.search_txt = ''
+        this.select_classify = 0
+        this.select_id = 0
+        this.sheetList = []
+        this.getTreeData()
+        this.getPublicList()
+    },
+    //表格 设置共享/取消共享
+    handleShareCommand(command){
+        if(command.key==='share'){
+            this.currentTable = command.item
+            this.isShowShareDia = true
+        }else{
+            //取消共享就是 两个权限列表都为空 但是要二次确认
+            this.$confirm(/* "是否确认取消共享?" */this.$t('CustomAnalysisPage.cancel_share_hint'), this.$t('Dialog.warn_tit'), {
+                type: "warning",
+           }).then(() => {
+                sheetInterface.sheetAnalysisInterface.setSheetShare({
+                    ExcelInfoId:command.item.ExcelInfoId,
+                    ViewUserIds:[],
+                    EditUserIds:[]
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success(this.$t('CustomAnalysisPage.cancel_share_success_msg'))
+                    this.getTreeData()
+                    this.getPublicList()
+                })
+           })
+            .catch(() => {});
+        }
+    },
     /* 获取表格分类 */
     getTreeData(params = null) {
-      sheetInterface.classifyList({Source: this.sourceMap[this.$route.path],IsShowMe: this.isShowMe}).then((res) => {
+      sheetInterface.sheetAnalysisInterface.getSheetTreeList({IsShare:Boolean(this.classify_tab)}).then((res) => {
         const { Ret, Data } = res;
         if (Ret !== 200) return;
 
         this.showData = true;
         this.treeData = Data.AllNodes || [];
+        if(!this.classify_tab){
+            this.classifyOptions = this.formatTreeData(_.cloneDeep(this.treeData))
+        }
         this.$nextTick(() => {
           /* 新增完成后 处理树展开和选中 */
           params && this.selectCurrentNode(params);
@@ -498,12 +633,12 @@ export default {
     searchHandle(query) {
       if (query) {
         /* 查找列表 */
-        sheetInterface
-          .sheetList({
+        sheetInterface.sheetAnalysisInterface
+          .getSheetList({
             Keyword: query,
             CurrentIndex: 1,
             PageSize: 10000,
-            Source: this.sourceMap[this.$route.path]
+            IsShare:Boolean(this.classify_tab)
           })
           .then((res) => {
             if (res.Ret !== 200) return;
@@ -723,13 +858,12 @@ export default {
     },
     /* 获取表格列表 */
     getPublicList() {
-      sheetInterface
-        .sheetList({
+      sheetInterface.sheetAnalysisInterface
+        .getSheetList({
           CurrentIndex: this.sheet_page,
           PageSize: this.sheet_pages_size,
           ExcelClassifyId: this.select_classify || 0,
-          Source: this.sourceMap[this.$route.path],
-          IsShowMe: this.isShowMe 
+          IsShare:Boolean(this.classify_tab)
         })
         .then((res) => {
           if (res.Ret !== 200) return;
@@ -774,6 +908,11 @@ export default {
         this.sheetAllcellData = res.Data.SheetList.map(_ => _.Data ? JSON.parse(_.Data.Data) : []);
 
         this.getCellData(res.Data.SheetList)
+        //判断表格权限
+        //有编辑权限且无人编辑,标记编辑
+        this.limit.disabled = !this.sheetDetailInfo.Button.OpButton
+        this.sheetDetailInfo.Button.OpButton&&!this.sheetDetailInfo.Editor&&this.goEditHandle()
+        this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}${this.$t('OnlineExcelPage.editing_msg')}...`
       });
     },
 
@@ -831,7 +970,8 @@ export default {
     },
 
     /* 表格另存为 */
-    saveOtherHandle() {
+    saveOtherHandle(cell) {
+      cell&&(this.sheetDetailInfo = cell)
       this.saveOtherForm.name = this.sheetDetailInfo.ExcelName + "(1)";
       this.isSaveOther = true;
     },
@@ -952,13 +1092,14 @@ export default {
       this.getTreeData();
       this.getPublicList();
     }
-
     window.addEventListener("resize", this.reloadRightWid);
     document.addEventListener("click", this.closeHint);
+    window.addEventListener('beforeunload',this.unloadMark)
   },
   destroyed() {
     window.removeEventListener("resize", this.reloadRightWid);
     document.removeEventListener("click", this.closeHint);
+    window.removeEventListener('beforeunload',this.unloadMark)
   },
 };
 </script>
@@ -1016,7 +1157,25 @@ $normal-font: 14px;
       .search-cont {
         padding: 0 20px;
       }
-
+      .left-tab {
+        display: flex;
+        align-items: center;
+        padding: 20px 20px 0;
+        .tab {
+          cursor: pointer;
+          font-size: 16px;
+          border-bottom: 2px solid transparent;
+          margin-right: 40px;
+          padding-bottom: 5px;
+          &.act {
+            color: #409eff;
+            border-color: #409eff;
+          }
+          &:hover {
+            color: #409eff;
+          }
+        }
+      }
       .tree-cont {
         padding: 30px 20px;
         max-height: calc(100vh - 280px);

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -43,7 +43,7 @@ export default {
     selectCurrentNode({ code, id, type }) {
       let deep_arr = _.cloneDeep(this.treeData);
       // 查找图表的分类父级id
-      let arr = this.findParentNodeHandle(deep_arr, code).slice(1).reverse(); // 父的父的父-父的父-父
+      let arr = (this.findParentNodeHandle(deep_arr, code)||[]).slice(1).reverse(); // 父的父的父-父的父-父
       this.defaultShowNodes = arr;
       this.select_node = code;
       this.$refs.treeRef.setCurrentKey(this.select_node);

src/views/mychart_manage/components/chartDetailDia.vue

@@ -100,8 +100,12 @@
                 />
                 <!-- 复制到 -->{{$t('Chart.chart_copyto_btn')}}
               </span>
-              <span v-permission="permissionBtn.myETAPermission.myChart_refresh"
-                  class="span-item" @click="refreshHandle" style="margin-left: 7px;">
+              <span 
+                v-permission="permissionBtn.myETAPermission.myChart_refresh"
+                class="span-item" 
+                @click="refreshHandle" 
+                style="margin-left: 7px;"
+              >
                 <span><i class="el-icon-refresh" style="font-size: 15px;"/>&nbsp;<!-- 刷新 -->{{$t('Edb.detail_refresh_btn')}} </span>
               </span>
               <span
@@ -820,15 +824,8 @@ export default {
       }
       const { EdbInfoList } = res.Data;
 
-      this.tableData.forEach((item) => {
-        let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
-        item.DataList = edbData.DataList;
-        //更新起始时间和最近更新时间
-        item.StartDate = edbData.StartDate;
-        item.ModifyTime = edbData.ModifyTime;
-        
-        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
-      });
+      //更新表格数据
+      this.tableData = _.cloneDeep(EdbInfoList);
     },
 
     /* 打开时间段弹窗 */

src/views/ppt_manage/mixins/pptMixins.js

@@ -786,11 +786,10 @@ export default {
           chart: {
             ...defaultOpts.chart,
 					  ...chartTheme&&chartTheme.drawOption,
-            spacing: chartTheme.legendOptions.verticalAlign==='bottom' ? [23,10,2,10] : [2,10,2,10],//图例在底部顶部空间留大点给单位
+            spacing: chartTheme.legendOptions.verticalAlign==='bottom' ? [25,10,2,10] : [2,10,2,10],//图例在底部顶部空间留大点给单位
             animation: false,
             backgroundColor: "rgba(0,0,0,0)",
             renderTo:$(`#${refName}`)[0],
-            ...options.chart||{},
           },
           legend: {
             ...defaultOpts.legend,

src/views/ppt_manage/newVersion/components/catalog/chooseShareUserDia.vue

@@ -14,7 +14,7 @@
       <div style="margin-bottom: 20px;">
         <label style="margin-right: 40px"> {{$t('Slides.shared_users_lable')}}</label>
         <el-radio-group v-model="share_type" size="mini" @change="select_users=[]">
-          <el-radio :label="1">{{$t('Slides.ficc_researchers_radio')}}</el-radio>
+          <el-radio :label="1">{{$t('Slides.all_users_radio')}}</el-radio>
           <el-radio :label="2">{{$t('Slides.specify_members_radio')}}</el-radio>
         </el-radio-group>
       </div>

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -237,7 +237,7 @@
                         <span>{{item.Title}}</span>
                 </div>
                 <div class="item-opt">
-                    <span v-for="optItem in setListTool()" :key="optItem.key" @click.stop="handleListToolClick(optItem,item)">
+                    <span v-for="optItem in setListTool(item)" :key="optItem.key" @click.stop="handleListToolClick(optItem,item)">
                         {{ getListMenuOptText(optItem.label) }}
                     </span>
                 </div>
@@ -469,7 +469,6 @@ export default {
         if(e==='演示') return this.$t('Slides.list_ppt_item_preview')
         if(e==='下载') return this.$t('Slides.list_ppt_item_download')
         if(e==='编辑') return this.$t('Slides.list_ppt_item_edit')
-
     },
     //ppt详情操作栏
     getContentMenuOptText(e){
@@ -599,7 +598,7 @@ export default {
       }
     },
     //设置列表的操作按钮
-    setListTool(){
+    setListTool(itemData){
       let list = []
       const {checkPermissionBtn,pptPermission} = this.permissionBtn
       const authMap = {
@@ -818,12 +817,29 @@ export default {
       })
     },
     //点击列表操作栏事件处理
-    handleListToolClick(item,{PptId,PptxUrl,Title}){
-        const urlMap = {
+    async handleListToolClick(item,{PptId,PptxUrl,Title,Editor}){
+      if(item.key==='edit'&&Editor.IsEditing&&Editor.AdminId!==Number(localStorage.getItem('AdminId'))){
+        this.$message.warning(`${Editor.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+        return
+      }
+      const urlMap = {
         edit:`/ppteditor?id=${PptId}`,
         publish:`/pptpublish?id=${PptId}`,
         present:`/pptpresent?id=${PptId}`
       }
+      if(item.key==='edit'){
+        //判断能否编辑
+        const editRes=await pptInterface.pptEditLock({PptId:Number(PptId),Status:0})
+        if(editRes.Ret!==200) return
+        if(editRes.Data&&editRes.Data.IsEditing&&editRes.Data.AdminId!==Number(localStorage.getItem('AdminId'))){
+          Editor=editRes.Data
+          this.$message.warning(`${editRes.Data.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+          return
+        }
+        //调接口加锁然后跳转
+        const res = await pptInterface.pptEditLock({PptId:Number(PptId),Status:1})
+        if(res.Ret!==200) return
+      }
       if(urlMap[item.key]){
         window.open(urlMap[item.key],'_blank')
         return 
@@ -849,6 +865,14 @@ export default {
                     this.$message.warning(this.$t('Slides.no_duplicated_edit_msg') )
                     return
                 }
+                //判断能否编辑
+                const editRes=await pptInterface.pptEditLock({PptId:Number(this.pptItem.PptId),Status:0})
+                if(editRes.Ret!==200) return
+                if(editRes.Data&&editRes.Data.IsEditing&&editRes.Data.AdminId!==Number(localStorage.getItem('AdminId'))){
+                  this.setToolList({Editor:{...editRes.Data}})
+                  this.$message.warning(`${editRes.Data.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+                  return
+                }
                 //调接口加锁然后跳转
                 const res = await pptInterface.pptEditLock({PptId:Number(this.pptItem.PptId),Status:1})
                 if(res.Ret!==200) return

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -232,7 +232,7 @@
                         <span>{{item.Title}}</span>
                 </div>
                 <div class="item-opt">
-                    <span v-for="optItem in setListTool()" :key="optItem.key" @click.stop="handleListToolClick(optItem,item)">
+                    <span v-for="optItem in setListTool(item)" :key="optItem.key" @click.stop="handleListToolClick(optItem,item)">
                         {{ getListMenuOptText(optItem.label) }}
                     </span>
                 </div>
@@ -571,7 +571,7 @@ export default {
       }
     },
     //设置列表的操作按钮
-    setListTool(){
+    setListTool(itemData){
       let list = []
       const {checkPermissionBtn,pptPermission} = this.permissionBtn
       const authMap = {
@@ -782,12 +782,31 @@ export default {
       })
     },
     //点击列表操作栏事件处理
-    handleListToolClick(item,{PptId,PptxUrl,Title}){
-        const urlMap = {
+    async handleListToolClick(item,{PptId,PptxUrl,Title,Editor}){
+      if(item.key==='edit'&&Editor.IsEditing&&Editor.AdminId!==Number(localStorage.getItem('AdminId'))){
+        this.$message.warning(`${Editor.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+        return
+      }
+      const urlMap = {
         edit:`/ppteneditor?id=${PptId}`,
         publish:`/pptenpublish?id=${PptId}`,
         present:`/pptenpresent?id=${PptId}`
       }
+      if(item.key==='edit'){
+         //判断能否编辑
+        const editRes=await pptEnInterface.pptEditLock({PptId:Number(PptId),Status:0})
+        if(editRes.Ret!==200) return
+        if(editRes.Data&&editRes.Data.IsEditing&&editRes.Data.AdminId!==Number(localStorage.getItem('AdminId'))){
+          Editor=editRes.Data
+          this.$message.warning(`${editRes.Data.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+          return
+        }
+        //调接口加锁然后跳转
+        const res = await pptEnInterface.pptEditLock({PptId:Number(PptId),Status:1})
+        if(res.Ret!==200) return
+      }
+      
+
       if(urlMap[item.key]){
         window.open(urlMap[item.key],'_blank')
         return 
@@ -812,6 +831,14 @@ export default {
                     this.$message.warning(this.$t('Slides.no_duplicated_edit_msg') )
                     return
                 }
+                //判断能否编辑
+                const editRes=await pptEnInterface.pptEditLock({PptId:Number(this.pptItem.PptId),Status:0})
+                if(editRes.Ret!==200) return
+                if(editRes.Data&&editRes.Data.IsEditing&&editRes.Data.AdminId!==Number(localStorage.getItem('AdminId'))){
+                  this.setToolList({Editor:{...editRes.Data}})
+                  this.$message.warning(`${editRes.Data.Editor}${this.$t('Slides.editing_progress_msg') }...`)
+                  return
+                }
                 //调接口加锁然后跳转
                 const res = await pptEnInterface.pptEditLock({PptId:Number(this.pptItem.PptId),Status:1})
                 if(res.Ret!==200) return

src/views/system_manage/components/authSetDialog.vue

@@ -1,212 +0,0 @@
-<template>
-  <el-dialog
-		:visible.sync="isShow"
-		:close-on-click-modal="false"
-		:modal-append-to-body="false"
-		@close="cancelHandle"
-		custom-class="auth-set-dialog"
-		center
-		width="850px"
-		top="5vh"
-		v-dialogDrag
-    :title="edbForm.title"
-	>
-    <div class="cont">
-      <div class="header">
-        <span>{{$t('SystemManage.OperateAuth.invisible_users')}}</span>
-        <el-cascader
-          v-model="filterUsers"
-          :options="userList"
-          :props="{
-            value: 'AdminId',
-            label: 'RealName',
-            children: 'ChildrenList',
-            emitPath: false,
-            multiple: true,
-            disabled: 'Creater'
-          }"
-          collapse-tags
-          :show-all-levels="false"
-          clearable
-          filterable
-          :placeholder="$t('SystemManage.OperateAuth.placeholder04')" 
-          style="margin: 0 20px"
-        />
-        <el-button type="primary" @click="setAuthHandle">{{$t('Dialog.set_btn')}}</el-button>
-      </div>
-      <template v-if="edbForm.title===$t('SystemManage.OperateAuth.permission_title01')">
-        <el-table
-          :data="filterTable"
-          border
-          style="margin: 20px 0"
-        >
-          <el-table-column v-for="item in tableColums" :key="item.key" align="center" :label="item.label">
-            <template slot-scope="{row}">
-              <span>{{ row[item.key] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" :label="$t('Table.column_operations')">
-            <template slot-scope="{row}" >
-              <el-popconfirm
-                :title="$t('SystemManage.OperateAuth.permission_confirm_msg')"
-                @onConfirm="removeUser(row)"
-              >
-                <span slot="reference" class="deletesty">{{$t('Table.delete_btn')}}</span>
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-col :span="24" style="height:100px">
-          <m-page
-            :page_no="pageNo"
-            :pageSize="pageSize"
-            :total="total"
-            @handleCurrentChange="pageChange"
-          />
-        </el-col>
-      </template>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { operateAuthInterface } from '@/api/modules/setApi';
-import mPage from '@/components/mPage';
-export default {
-  props: {
-    isShow: {
-      type: Boolean
-    },
-    users: {
-      type: Array
-    },
-    edbForm: {
-      type: Object
-    }
-  },
-  components: { mPage },
-  watch: {
-    isShow(nval) {
-      if(!nval) return
-      
-      let uers_arr = _.cloneDeep(this.users);
-      this.disableCreaterHandle(uers_arr);
-      this.userList = uers_arr;
-      this.edbForm.title===this.$t('SystemManage.OperateAuth.permission_title01') && this.getTableList()
-    }
-  },
-  computed:{
-    tableColums(){
-      return [
-        { label:this.$t('SystemManage.DepartManage.user_table_name'),key: 'RealName' },
-        { label:this.$t('SystemManage.DepartManage.user_table_role'),key: 'RoleName' },
-        { label:this.$t('SystemManage.DepartManage.user_table_depart'),key: 'DepartmentGroup' },
-      ]
-    }
-  },
-  data() {
-    return {
-      userList: [],
-      filterUsers: [],
-
-      tableData: [],
-      filterTable: [],
-      // tableColums:[
-      //   { label:'姓名',key: 'RealName' },
-      //   { label:'角色',key: 'RoleName' },
-      //   { label:'部门/分组',key: 'DepartmentGroup' },
-      // ],
-      pageNo:1,
-      pageSize: 10,
-      total: 0,
-    }
-  },
-  methods: {
-
-    /* 数据列表 */
-    getTableList() {
-      operateAuthInterface.getEdbNoAuthList({
-        EdbInfoId: this.edbForm.ids[0]
-      }).then(res => {
-        if(res.Ret !== 200) return
-        this.tableData = res.Data.List || [];
-        this.total = this.tableData.length;
-        this.filterTable = this.tableData.slice(0,this.pageSize*this.pageNo);
-        // this.filterUsers = this.tableData.length ? this.tableData.map(_ => _.AdminId) : [];
-
-      })
-    },
-
-    disableCreaterHandle(arr) {
-      // let filter_arr = arr.form
-      arr.forEach(item => {
-        item.ChildrenList && item.ChildrenList.length && this.disableCreaterHandle(item.ChildrenList);
-        if( Number(item.AdminId) === this.edbForm.createId) {
-          item.Creater = true;
-        }
-      })
-    },
-
-    pageChange(page) {
-      this.pageNo = page;
-      this.filterTable = this.tableData.slice(this.pageSize*(this.pageNo-1),this.pageSize*this.pageNo);
-    },
-
-
-    cancelHandle() {
-      this.pageNo = 1;
-      this.filterUsers = [];
-      this.filterTable = [];
-      this.$emit('update:isShow',false)
-    },
-
-    /* 删除 */
-    removeUser({AdminId}) {
-          operateAuthInterface.edbNoAuthDel({
-            EdbInfoId: Number(this.edbForm.ids[0]),
-            AdminId
-          }).then(res => {
-            if(res.Ret !== 200) return 
-            this.$message.success(this.$t('MsgPrompt.delete_msg'));
-            this.getTableList();
-          })
-    },
-
-    /* 设置权限 */
-    async setAuthHandle() {
-      if(!this.filterUsers.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.placeholder04'))
-      // let res = this.edbForm.title === '权限设置' 
-      //   ? await operateAuthInterface.edbNoAuthSet({
-      //       EdbInfoId: Number(this.edbForm.ids[0]),
-      //       AdminIdList: this.filterUsers.map(_ => Number(_))
-      //   })
-      //   : 
-      let res = await operateAuthInterface.edbNoAuthBatchSet({
-          EdbInfoIdList: this.edbForm.ids.map(_ => Number(_)),
-          AdminIdList: this.filterUsers.map(_ => Number(_))
-        })
-
-      if(res.Ret !== 200) return 
-      this.$message.success(this.$t('SystemManage.OperateAuth.set_success'))
-      if(this.edbForm.title === this.$t('SystemManage.OperateAuth.permission_title01')) {
-        this.filterUsers=[]
-        this.getTableList()
-      }else {
-        this.$emit('setSuccess');
-        this.cancelHandle()
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" soped>
-.cont {
-  min-height: 250px;
-}
-</style>
-<style lang='scss'>
-.auth-set-dialog {
-  .el-cascader .el-input {width: 100%;}
-}
-</style>

src/views/system_manage/dataOperaAuth.vue

@@ -470,17 +470,24 @@ export default {
       if (res.Ret !== 200) return
     
       this.userList = res.Data || []
-      this.filterTreeEmpty(this.userList)
+      this.filterTreeEmpty({Children:this.userList})
     },
 
     // 递归处理数组
     filterTreeEmpty(arr) {
-      arr.length && arr.forEach(item => {
-        item.Children && item.Children.length && this.filterTreeEmpty(item.Children)
-        if (!item.Children || !item.Children.length) {
-          delete item.Children
-        }
-      })
+      function dfs(node) {
+          if (Array.isArray(node.Children)) {
+              for (let child of node.Children) {
+                  dfs(child);
+              }
+              if(node.Children.length===0) delete node.Children
+          }
+          //若为叶子节点,且不为用户,禁止选中
+          if(!node.Children||!Array.isArray(node.Children)){
+              if(node.NodeType!==3) node.disabled = true
+          }
+      }
+      dfs(arr); 
     },
 
     /* 获取用户的资产数量 */

src/views/system_manage/operateAuthManage.vue

@@ -1,481 +0,0 @@
-<template>
-  <div class="container">
-    <div class="top">
-      <ul class="tab-ul">
-        <li :class="['tab-li',{act: default_tab===item.key}]" v-for="item in authTabs" :key="item.key" @click="changeTab(item)">{{item.label}}</li>
-      </ul>
-    </div>
-
-    <div class="top">
-        <div v-if="authTabs.length">
-            <el-input 
-            v-model="searchForm.key_word" 
-            :placeholder="default_tab === 5 ? this.$t('SystemManage.OperateAuth.placeholder01') : this.$t('SystemManage.OperateAuth.placeholder02')" 
-            style="width: 300px;margin-right:20px;"
-            @change="changeUser"
-            clearable
-            >
-            <i slot="prefix" class="el-input__icon el-icon-search"/>
-            </el-input>
-        </div>
-        <div v-if="authTabs.length" style="margin-right:auto;">
-          <el-cascader
-            v-model="searchForm.classification"
-            :options="classificationList"
-            :props="{
-              value: 'ClassifyId',
-              label: 'ClassifyName',
-              children: 'Child',
-              emitPath: false,
-              multiple:true
-            }"
-            collapse-tags
-            :show-all-levels="false"
-            :key="default_tab"
-            clearable
-            filterable
-            @change="changeUser"
-            :placeholder="this.$t('SystemManage.OperateAuth.placeholder03')" 
-            style="width: 250px;"
-          />
-          <el-cascader
-            v-model="searchForm.user"
-            :options="userList"
-            :props="{
-              value: 'AdminId',
-              label: 'RealName',
-              children: 'ChildrenList',
-              emitPath: false
-            }"
-            collapse-tags
-            :show-all-levels="false"
-            clearable
-            @change="changeUser"
-            filterable
-            :placeholder="this.$t('SystemManage.OperateAuth.placeholder04')" 
-            style="margin: 0 20px"
-          />
-        </div>
-        <div>
-          <el-button type="primary" @click="editAuthHandle({},'multiple')" 
-          v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">{{$t('SystemManage.OperateAuth.btn_text01')}}</el-button>
-          <el-button type="primary" @click="edbAuthSetHandle({},'multiple')" v-if="[3,4].includes(default_tab
-        )&&authBtn('auth')">{{$t('SystemManage.OperateAuth.btn_text02')}}</el-button>
-        </div>
-    </div>
-     <el-table
-        :data="tableData"
-        ref="table"
-        element-loading-text="加载中..."
-        v-loading="tableLoading"
-        border
-        style="margin:30px 0"
-        @selection-change="selectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-        />
-        <el-table-column
-          v-for="item in tableColums"
-          :key="item.label"
-          :label="item.label"
-          :prop="item.key"
-          :width="item.widthsty"
-          :min-width="item.minwidthsty"
-          align="center"
-        >
-          <template slot-scope="{row}">
-            <template v-if="item.key==='handle'">
-              <span class="editsty" @click="edbAuthSetHandle(row)" v-if="[3,4].includes(default_tab
-        )&&authBtn('auth')">{{$t('SystemManage.OperateAuth.btn_text02')}}</span>
-              <span class="editsty" @click="editAuthHandle(row)" v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">{{$t('Dialog.title_prefix_edit')}}</span>
-            </template>
-
-            <span v-else>{{ row[item.key] }}</span>
-          </template>
-        </el-table-column>
-        
-        <div slot="empty" style="padding: 100px 0">
-          <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
-				</div>
-    </el-table>
-    <el-col :span="24" style="height:35px;text-align: right;float: none;">
-      <m-page
-        :page_no="page_no"
-        :pageSize="pageSize"
-        :total="total"
-        @handleCurrentChange="pageChange"
-      />
-    </el-col>
-
-     <!-- 编辑弹窗 -->
-    <m-dialog
-      :show.sync="isOpenDialog"
-      width="650px"
-      :title="dialogForm.title"
-      @close="isOpenDialog = false"
-    >
-      <div class="dialog-cont operateauth-dialog-cont">
-        <el-form
-          ref="formRef"
-          label-position="left"
-          hide-required-asterisk
-          label-width="80px"
-          :model="dialogForm"
-          :rules="dialogFormRules"
-          @close="cancelDialogHandle"
-        >
-          <el-form-item :label="$t('SystemManage.OperateAuth.original_creator')">
-            <span>{{ dialogForm.old_user_name }}</span>
-          </el-form-item>
-          <el-form-item :label="$t('SystemManage.OperateAuth.new_creator')" prop="new_user">
-            <el-cascader
-              v-model="dialogForm.new_user"
-              :options="userList"
-              :props="{
-                value: 'AdminId',
-                label: 'RealName',
-                children: 'ChildrenList',
-                emitPath: false
-              }"
-              collapse-tags
-              :show-all-levels="false"
-              clearable
-              filterable
-              :placeholder="$t('SystemManage.OperateAuth.placeholder04')" 
-              style="width: 250px"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="dia-bot">
-        <el-button
-          type="primary"
-          style="margin-right: 60px"
-          @click="saveHandle"
-          >{{$t('Dialog.confirm_save_btn')}}</el-button
-        >
-        <el-button type="primary" plain @click="cancelDialogHandle"
-          >{{$t('Dialog.cancel_btn')}}</el-button
-        >
-      </div>
-    </m-dialog>
-
-    <!-- 指标权限弹窗 -->
-    <edbSetDialog
-      :isShow.sync="isEdbSetDialog"
-      :edbForm="edbForm"
-      :users="userList"
-      @setSuccess="()=>{$refs.table.clearSelection();selectedArr=[]}"
-    />
-  </div>
-</template>
-
-<script>
-import { operateAuthInterface } from '@/api/modules/setApi';
-// import { customInterence } from '@/api/modules/crmApi';
-import {dataBaseInterface} from '@/api/modules/chartApi'
-import mPage from '@/components/mPage';
-import mDialog from '@/components/mDialog';
-import edbSetDialog from './components/authSetDialog.vue';
-export default {
-  components: { mPage,mDialog,edbSetDialog },
-  computed: {
-    tableColums() {
-      return this.default_tab === 5 ? [
-        { label: this.$t('SystemManage.OperateAuth.table_col_name01'),key: 'Name' },
-        { label: this.$t('SystemManage.OperateAuth.table_col_name02'),key: 'ClassifyName' },
-        { label: this.$t('SystemManage.OperateAuth.table_col_name03'),key: 'CreateUserName' },
-        { label: this.$t('Table.column_operations'),key: 'handle' },
-      ] : [
-        { label: this.$t('SystemManage.OperateAuth.table_col_name04'),key: 'Code' },
-        { label: this.$t('SystemManage.OperateAuth.table_col_name05'),key: 'Name' },
-        { label: this.$t('SystemManage.OperateAuth.table_col_name03'),key: 'CreateUserName' },
-        { label: this.$t('Table.column_operations'),key: 'handle' },
-      ]
-    },
-    //权限配置化后的tabs
-    authTabs(){
-        const {operateAuthPermission,checkPermissionBtn} = this.permissionBtn
-        const operaMap = {
-            1:checkPermissionBtn(operateAuthPermission.operateAuth_manual),
-            2:checkPermissionBtn(operateAuthPermission.operateAuth_mysteel),
-            3:checkPermissionBtn(operateAuthPermission.operateAuth_etaLib),
-            4:checkPermissionBtn(operateAuthPermission.operateAuth_etaPredictLib),
-            5:checkPermissionBtn(operateAuthPermission.operateAuth_chartLib),
-        }
-        let temp = []
-        for(const k in operaMap){
-            console.log('k',k,operaMap[k])
-            if(operaMap[k]){
-                temp.push(this.tabs[k-1])
-            }
-        }
-        return temp
-    },
-    tabs(){
-      return [
-        { label: this.$t('SystemManage.OperateAuth.tab01'), key: 1 },
-        { label: this.$t('SystemManage.OperateAuth.tab02'), key: 2 },
-        { label: this.$t('SystemManage.OperateAuth.tab03'), key: 3 },
-        { label: this.$t('SystemManage.OperateAuth.tab04'), key: 4 },
-        { label: this.$t('SystemManage.OperateAuth.tab05'), key: 5 }
-      ]
-    }
-  },
-  data() {
-    return {
-      default_tab: 1,
-      // tabs:[
-      //   { label: '手工数据指标', key: 1 },
-      //   { label: '钢联化工数据库', key: 2 },
-      //   { label: 'ETA指标库', key: 3 },
-      //   { label: 'ETA预测指标', key: 4 },
-      //   { label: '图库', key: 5 }
-      // ],
-      selectedArr: [],//多选数组
-      tableLoading: false,
-      tableData:[],
-      page_no: 1,
-      total: 0,
-      pageSize: 10,
-
-      userList: [],
-      classificationList:[],
-      searchForm: {
-        classification:[],
-        user: '',
-        key_word: ''
-      },
-
-      isOpenDialog: false,
-      dialogForm: {
-        title: '',
-        old_user_name: '',
-        ids:'',
-        new_user: '',
-      },
-      dialogFormRules: {
-        new_user: [
-          { required: true, message: this.$t('SystemManage.OperateAuth.placeholder05'), trigger: 'change' }
-        ]
-      },
-
-      /* 指标权限设置 */
-      isEdbSetDialog: false,
-      edbForm: {}
-    }
-  },
-  methods: {
-
-    getTableData() {
-      this.tableLoading = true;
-      let params = {
-        Source: this.default_tab,
-        UserId: this.searchForm.user || '',
-        CurrentIndex: this.page_no,
-        PageSize: this.pageSize,
-        Keyword: this.searchForm.key_word,
-        Classify:this.searchForm.classification.join(',')
-      }
-			operateAuthInterface.list(params).then(res => {
-        this.tableLoading = false;
-        if( res.Ret!==200 )return
-
-        const { Data } = res;
-        Data.List && Data.List.forEach(_ => {
-          _.ModifyTime = _.ModifyTime ? this.$moment(_.ModifyTime).format('YYYY-MM-DD HH:mm:ss') : ''
-          _.PublishTime = _.PublishTime ? this.$moment(_.PublishTime).format('YYYY-MM-DD HH:mm:ss') : ''
-        })
-        this.tableData = Data.List || [];
-        this.total=parseInt(Data.Paging.Totals);
-			});
-    },
-    /* 获取用户列表 */
-    getUserList() {
-      // customInterence.getSale({Status: 0,AllEnabled: true}).then(res => {
-      dataBaseInterface.getEdbChartAdminList({Source: this.default_tab}).then(res=>{
-        if(res.Ret !== 200) return
-
-        this.userList = res.Data || [];
-      })
-    },
-    /* 获取分类列表 */
-    getClassificationList() {
-      operateAuthInterface.getClassificationBySource({Source: this.default_tab}).then(res => {
-        if(res.Ret == 200){
-          this.classificationList = res.Data.List || []
-          //如果是三级分类,去掉最后一级分类的child
-          if([3,4,5].includes(this.default_tab)){
-            this.filterNodes(this.classificationList)
-          }
-        }
-      })
-    },
-    filterNodes(arr) {
-        arr.length && arr.forEach(item => {
-            item.Child && item.Child.length && this.filterNodes(item.Child)
-            if(item.Child && !item.Child.length) {
-                delete item.Child
-            }
-        })
-    },
-    
-    changeTab({key}) {
-      this.default_tab = key;
-      this.searchForm.classification=[]
-      this.searchForm.user=''
-      this.page_no = 1;
-      this.getClassificationList()
-      this.getUserList()
-      this.getTableData();
-    },
-
-    pageChange(page) {
-      this.page_no = page;
-      this.getTableData()
-    },
-
-    changeUser() {
-      this.page_no = 1;
-      this.getTableData();
-    },
-
-    /* 复选框选择 */
-    selectionChange(val) {
-      console.log(val)
-      this.selectedArr = val || [];
-    },
-
-    /* 编辑 */
-    editAuthHandle({DataId,CreateUserName,},type='single') {
-      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.msg01'))
-
-      this.dialogForm = {
-        title: type === 'multiple' ? this.$t('SystemManage.OperateAuth.edit_title02') : this.$t('SystemManage.OperateAuth.edit_title01'),
-        old_user_name: type === 'multiple' ? this.selectedArr[0].CreateUserName : CreateUserName,
-        ids: type === 'multiple' ? this.selectedArr.map(_ => _.DataId) : [DataId],
-        new_user: ''
-      }
-      this.isOpenDialog = true;
-    },
-
-    async saveHandle() {
-      await this.$refs.formRef.validate()
-
-      const res = await operateAuthInterface.authEdit({
-        Source: this.default_tab,
-        DataIdList: this.dialogForm.ids,
-        NewUserId: Number(this.dialogForm.new_user)
-      })
-
-      if(res.Ret !== 200) return
-      this.$message.success(res.Msg);
-      this.cancelDialogHandle();
-      this.getTableData();
-    },
-
-    /* 指标权限配置 */
-    edbAuthSetHandle({DataId,CreateUserId},type='') {
-      if(type === 'multiple' && !this.selectedArr.length) return this.$message.warning(this.$t('SystemManage.OperateAuth.msg01'))
-      if(type === 'multiple' && this.selectedArr.some(_ => this.selectedArr[0].CreateUserId!==_.CreateUserId)) return this.$message.warning('所选指标创建人不是同一用户，请重新选择！')
-
-      this.edbForm = {
-        title: type === 'multiple' ? this.$t('SystemManage.OperateAuth.permission_title02') : this.$t('SystemManage.OperateAuth.permission_title01'),
-        createId: type === 'multiple' ? this.selectedArr[0].CreateUserId : CreateUserId,
-        ids: type === 'multiple' ? this.selectedArr.map(_ => _.DataId) : [DataId],
-      }
-      this.isEdbSetDialog = true;
-      
-    },
-
-    cancelDialogHandle() {
-      this.$refs.formRef.resetFields();
-      this.isOpenDialog = false
-    },
-    authBtn(type){
-        const {operateAuthPermission,checkPermissionBtn} = this.permissionBtn
-        const authMap = {
-            3:operateAuthPermission.operateAuth_etaLib_authSetting,
-            4:operateAuthPermission.operateAuth_etaPredictLib_authSetting,
-        }
-        const editMap = {
-            3:operateAuthPermission.operateAuth_etaLib_edit,
-            4:operateAuthPermission.operateAuth_etaPredictLib_edit,
-        }
-        if(type==='auth'){
-            return checkPermissionBtn(authMap[this.default_tab])
-        }else{
-            return checkPermissionBtn(editMap[this.default_tab])
-        }
-    }
-  },
-  mounted() {
-    if(this.authTabs.length){
-        this.getUserList();
-    }
-  },
-  created(){
-    if(this.authTabs.length){
-        this.default_tab = this.authTabs[0].key
-        this.getClassificationList()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "~@/styles/theme-vars.scss";
-.container {
-  box-sizing: border-box;
-  min-height: calc(100vh - 120px);
-  padding: 20px 30px;
-  background: #fff;
-  position: relative;
-  border: 1px solid #ECECEC;
-  border-radius: 4px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
-  .top {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    margin-top: 15px;
-    .tab-ul,.right-side {
-      display: flex;
-      margin: 5px 0;
-      .tab-li {
-        margin-right: 20px;
-        min-width: 120px;
-        padding: 12px 0;
-        text-align: center;
-        color: $theme-color;
-        border: 1px solid $theme-color;
-        background: #e6eefb;
-        border-radius: 4px;
-        cursor: pointer;
-        &.act {
-          color: #fff;
-          border: 1px solid $theme-color;
-          background: $theme-color;
-        }
-      }
-    }
-  }
-
-}
-.dialog-cont {
-  padding-left: 110px;
-}
-.dia-bot {
-  display: flex;
-  justify-content: center;
-  margin-top: 50px;
-}
-</style>
-<style lang="scss">
-.operateauth-dialog-cont .el-input {
-  width: 100%;
-}
-</style>