eta表格按钮权限整理

src/api/modules/sheetApi.js

@@ -332,5 +332,14 @@ export const sheetAnalysisInterface = {
 	 */
 	edbListBySheet: params => {
 		return http.get('/custom_analysis/edb/list',params)
+	},
+
+	/**
+	 * 刷新
+	 * @param {*} params ExcelInfoId
+	 * @returns 
+	 */
+	sheetRefresh: params => {
+		return http.get('/custom_analysis/edb/refresh',params)
 	}
 }

src/routes/modules/chartRoutes.js

@@ -103,12 +103,12 @@ export default [
 			},
 			{
 				path:"addCustomSheet",
-				name:"添加表格",
+				name:"添加数据表格",
 				component:()=>import('@/views/datasheet_manage/customSheetEdit.vue')
 			},
 			{
 				path:"addMixedSheet",
-				name:"添加表格",
+				name:"添加混合表格",
 				component:()=>import('@/views/datasheet_manage/mixedSheetEdit.vue')
 			},
 			{

src/utils/buttonConfig.js

@@ -344,9 +344,9 @@ export const etaTablePermission = {
     etaTable_customize_edit:'etaTable:customize:edit', */
 
     //混合表格页面
-    etaTable_customize_mixSheet_add: 'etaTable:customize:mixSheet:add',//添加混合表格按钮
-    etaTable_classifyOpt_mix_edit: 'etaTable:classifyOpt:mix:edit',//混合表格分类操作
-    etaTable_classifyOpt_mix_delete: 'etaTable:classifyOpt:mix:delete',//混合表格分类删除
+    etaTable_customize_mix_sheetAdd: 'etaTable:customize:mix:sheetAdd',//添加混合表格按钮
+    etaTable_customize_mix_classifyOpt_edit: 'etaTable:customize:mix:classifyOpt:edit',//混合表格分类操作
+    etaTable_customize_mix_classifyOpt_delete: 'etaTable:customize:mix:classifyOpt:delete',//混合表格分类删除
     etaTable_customize_mix_edit:'etaTable:customize:mix:edit',//编辑
     etaTable_customize_mix_refresh:'etaTable:customize:mix:refresh',//刷新
     etaTable_customize_mix_otherSave:'etaTable:customize:mix:otherSave',//另存为
@@ -354,9 +354,9 @@ export const etaTablePermission = {
     etaTable_customize_mix_del:'etaTable:customize:mix:del',//删除
 
     //数据表格页面
-    etaTable_customize_dataSheet_add: 'etaTable:customize:dataSheet:add',//添加数据表格按钮
-    etaTable_classifyOpt_data_edit: 'etaTable:classifyOpt:data:edit',//数据表格分类操作
-    etaTable_classifyOpt_data_delete: 'etaTable:classifyOpt:data:delete',//数据表格分类删除
+    etaTable_customize_data_sheetAdd: 'etaTable:customize:data:sheetAdd',//添加数据表格按钮
+    etaTable_customize_data_classifyOpt_edit: 'etaTable:customize:data:classifyOpt:edit',//数据表格分类操作
+    etaTable_customize_data_classifyOpt_delete: 'etaTable:customize:data:classifyOpt:delete',//数据表格分类删除
     etaTable_customize_data_edit:'etaTable:customize:data:edit',//编辑
     etaTable_customize_data_refresh:'etaTable:customize:data:refresh',//刷新
     etaTable_customize_data_otherSave:'etaTable:customize:data:otherSave',//另存为
@@ -365,22 +365,23 @@ export const etaTablePermission = {
 
     /*-----------excel表格页面--------- */
     etaTable_excel:'etaTable:excel',//添加Excel表格这个按钮显示不显示
-    etaTable_classifyOpt_edit:'etaTable:classifyOpt:edit',//添加编辑表格
-    etaTable_classifyOpt_delete:'etaTable:classifyOpt:delete',//删除表格
+    etaTable_excel_classifyOpt_edit:'etaTable:excel:classifyOpt:edit',//添加编辑表格
+    etaTable_excel_classifyOpt_delete:'etaTable:excel:classifyOpt:delete',//删除表格
     etaTable_excel_del:'etaTable:excel:del',
     etaTable_excel_download:'etaTable:excel:download',
     etaTable_excel_save:'etaTable:excel:save',
 
     //自定义分析表格页面
-    etaTable_analysisSheet_add: 'etaTable:analysisSheet:add',//添加数据表格按钮
-    etaTable_classifyOpt_analysis_edit: 'etaTable:classifyOpt:analysis:edit',//数据表格分类操作
-    etaTable_classifyOpt_analysis_delete: 'etaTable:classifyOpt:analysis:delete',//数据表格分类删除
+    // etaTable_analysis_sheetAdd: 'etaTable:analysis:sheetAdd',//添加数据表格按钮
+    etaTable_analysis_classifyOpt_edit: 'etaTable:analysis:classifyOpt:edit',//数据表格分类操作
+    etaTable_analysis_classifyOpt_delete: 'etaTable:analysis:classifyOpt:delete',//数据表格分类删除
     etaTable_analysis_upload:'etaTable:analysis:upload',//上传文件
     etaTable_analysis_createedb:'etaTable:analysis:createedb',//生成指标
     etaTable_analysis_refresh:'etaTable:analysis:refresh',//刷新
     etaTable_analysis_otherSave:'etaTable:analysis:otherSave',//另存为
     etaTable_analysis_download:'etaTable:analysis:download',//下载
     etaTable_analysis_del:'etaTable:analysis:del',//删除
+    etaTable_analysis_save:'etaTable:analysis:save',//保存
 }
 /*
  * --------------------------------------------------------------------------ETA逻辑------------------------------------------------

src/views/Home.vue

@@ -286,7 +286,7 @@
               :style="!isHaveAside ? 'padding: 0 30px 0 0;' : ''"
             >
               <transition name="fade" mode="out-in">
-                <router-view></router-view>
+                <router-view :key="$route.fullPath"></router-view>
               </transition>
             </el-col>
           </el-row>

src/views/datasheet_manage/components/sheetListWrap.vue

@@ -23,14 +23,14 @@
             <span>创建时间: {{ cell.CreateTime.slice(0, 10) }}</span>
             <div>
               <span
-                v-if="isDownLoadShow(cell)"
+                v-if="$parent.isSheetBtnShow('download')"
                 class="editsty"
                 style="margin-right: 10px"
                 @click="$emit('downloadExcel',cell)"
                 >下载</span
               >
               <span
-                v-if="isDeleteShow(cell)"
+                v-if="$parent.isSheetBtnShow('del')"
                 class="deletesty"
                 @click="$emit('delSheetHandle',{cell, type:'del-list'})"
                 >删除</span
@@ -55,26 +55,6 @@ export default {
   mounted(){
 
   },
-  methods:{
-    //判断右侧列表的下载按钮是否显示
-    isDownLoadShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_download)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_download)
-        }
-    },
-    //判断右侧列表的删除按钮是否显示
-    isDeleteShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_del)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_del)
-        }
-    }
-  },
 }
 </script>
 <style scoped lang='scss'>

src/views/datasheet_manage/customAnalysis/list.vue

@@ -16,6 +16,7 @@
             style="margin-right:20px"
             :loading="isUploadLoading"
             @click="clickUpload"
+            v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTable_analysis_upload)"
           >上传文件</el-button>
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
           
@@ -73,7 +74,7 @@
                 placeholder="请输入值"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit"
+                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')"
                 @blur="changeValue(data)"
               />
               <span
@@ -100,7 +101,7 @@
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ExcelInfoId"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')"
                 />
                 <img
                   slot="reference"
@@ -108,12 +109,12 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ExcelInfoId"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')"
                 />
               </span>
             </span>
           </el-tree>
-          <div class="noDepart" @click="addLevelOneHandle">
+          <div class="noDepart" @click="addLevelOneHandle" v-if="isSheetBtnShow('classifyOpt_edit')">
             <img
               src="~@/assets/img/set_m/add_ico.png"
               alt=""
@@ -162,21 +163,23 @@
               <i class="el-icon-edit"/>
             </span>
             <ul class="action-ul">
-              <li class="editsty" @click="HandleToPath">生成指标</li>
-              <li class="editsty" @click="refreshSheet">刷新</li>
-              <li class="editsty" @click="saveHandle">保存</li>
+              <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')">生成指标</li>
+              <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')">刷新指标</li>
+              <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')">保存</li>
               <li
                 class="editsty"
                 @click="saveOtherHandle"
+                v-if="isSheetBtnShow('otherSave')"
               >
                 另存为
               </li>
               <li class="editsty" @click="downloadExcel
-              (sheetDetailInfo)">
+              (sheetDetailInfo)" v-if="isSheetBtnShow('download')">
                 下载
               </li>
               <li
                 class="deletesty"
+                v-if="isSheetBtnShow('del')"
                 @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
               >
                 删除
@@ -768,8 +771,11 @@ export default {
     },
 
     /* 刷新表格 */
-    refreshSheet() {
+    async refreshSheet() {
+      let res = await sheetInterface.sheetAnalysisInterface.sheetRefresh({ExcelInfoId: this.sheetDetailInfo.ExcelInfoId})
 
+      if(res.Ret !== 200) return 
+      this.$message.success(res.Msg)
     },
 
     /* 重绘右侧区域宽度 */
@@ -779,24 +785,6 @@ export default {
       let rigtWid = total_wid - left - 20 + "px";
       $("#right")[0].style.width = rigtWid;
     },
-    //判断右侧列表的下载按钮是否显示
-    isDownLoadShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_download)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_download)
-        }
-    },
-    //判断右侧列表的删除按钮是否显示
-    isDeleteShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_del)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_del)
-        }
-    },
 
     clickUpload() {
       $(`#file`).click()

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -287,5 +287,38 @@ export default {
 
       return canDrop;
     },
+
+    //判断右侧列表的下载按钮是否显示
+    isDownLoadShow(cell){
+        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
+        const checkMap = {
+            1:etaTablePermission.etaTable_excel_download,
+            2:etaTablePermission.etaTable_customize_data_download,
+            3:etaTablePermission.etaTable_customize_mix_download,
+            4:etaTablePermission.etaTable_analysis_download
+        }
+        return checkPermissionBtn(checkMap[cell.Source])
+    },
+    //判断右侧列表的删除按钮是否显示
+    isDeleteShow(cell){
+        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
+        const checkMap = {
+            1:etaTablePermission.etaTable_excel_del,
+            2:etaTablePermission.etaTable_customize_data_del,
+            3:etaTablePermission.etaTable_customize_mix_del,
+            4:etaTablePermission.etaTable_analysis_del,
+        }
+        return checkPermissionBtn(checkMap[cell.Source])
+    },
+    //判断自定义表格-编辑,另存为,刷新按钮是否显示
+    isSheetBtnShow(type){
+      const sheetType = {
+        '/sheetList': 'etaTable_excel',
+        '/sheetTimeList': 'etaTable_customize_data',
+        '/sheetMixedList': 'etaTable_customize_mix',
+        '/sheetAnalysisList': 'etaTable_analysis'
+      }
+      return this.permissionBtn.isShowBtn('etaTablePermission',`${sheetType[this.$route.path]}_${type}`)
+    }
   },
 };

src/views/datasheet_manage/sheetList.vue

@@ -12,8 +12,8 @@
         <div class="datasheet_top">
           <el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_excel)&&sourceMap[$route.path]===1" type="primary" style="margin-right:20px" @click="goAddSheetHandle"
           >添加Excel表格</el-button >
-          <el-button v-if="sourceMap[$route.path]===2" type="primary" style="margin-right:20px" @click="goAddSheetHandle">添加时间序列表格</el-button >
-          <el-button v-if="sourceMap[$route.path]===3" type="primary" @click="goAddSheetHandle">添加混合表格</el-button >
+          <el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_data_sheetAdd)&&sourceMap[$route.path]===2" type="primary" style="margin-right:20px" @click="goAddSheetHandle">添加时间序列表格</el-button >
+          <el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_mix_sheetAdd)&&sourceMap[$route.path]===3" type="primary" @click="goAddSheetHandle">添加混合表格</el-button >
 
         </div>
         <div class="search-cont">
@@ -68,7 +68,7 @@
                 placeholder="请输入值"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')"
+                v-if="data.isEdit&&isSheetBtnShow('classifyOpt_edit')"
                 @blur="changeValue(data)"
               />
               <span
@@ -95,7 +95,7 @@
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ExcelInfoId&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_edit')"
                 />
                 <img
                   slot="reference"
@@ -103,12 +103,12 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ExcelInfoId&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_delete')"
+                  v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')"
                 />
               </span>
             </span>
           </el-tree>
-          <div class="noDepart" @click="addLevelOneHandle" v-if="permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')">
+          <div class="noDepart" @click="addLevelOneHandle" v-if="isSheetBtnShow('classifyOpt_edit')">
             <img
               src="~@/assets/img/set_m/add_ico.png"
               alt=""
@@ -162,7 +162,7 @@
                 @click="saveHandle"
                 v-if="
                   sheetDetailInfo.Source === 1 &&
-                  sheetDetailInfo.Button.OpButton&&isSheetBtnShow(sheetDetailInfo,'save')
+                  sheetDetailInfo.Button.OpButton&&isSheetBtnShow('save')
                 "
               >
                 保存
@@ -171,21 +171,21 @@
                 <li
                   class="editsty"
                   @click="goEditHandle"
-                  v-if="sheetDetailInfo.Button.OpButton&&isSheetBtnShow(sheetDetailInfo,'edit')"
+                  v-if="sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit')"
                 >
                   编辑
                 </li>
                 <li
                   class="editsty"
                   @click="refreshSheet"
-                  v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow(sheetDetailInfo,'refresh')"
+                  v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow('refresh')"
                 >
                   刷新
                 </li>
                 <li
                   class="editsty"
                   @click="saveOtherHandle"
-                  v-if="sheetDetailInfo.Button.CopyButton&&isSheetBtnShow(sheetDetailInfo,'otherSave')"
+                  v-if="sheetDetailInfo.Button.CopyButton&&isSheetBtnShow('otherSave')"
                 >
                   另存为
                 </li>
@@ -446,20 +446,6 @@ export default {
       }
     },
   },
-  computed:{
-    //数据表格是否展示
-    isShowDataSheet(){
-        const cell = {Source:2}
-        return this.isSheetBtnShow(cell,'edit')||this.isSheetBtnShow(cell,'refresh')||this.isSheetBtnShow(cell,'otherSave')
-            || this.isSheetBtnShow(cell,'download')||this.isSheetBtnShow(cell,'del')
-    },
-    //混合表格是否展示
-    isShowMixSheet(){
-        const cell = {Source:3}
-        return this.isSheetBtnShow(cell,'edit')||this.isSheetBtnShow(cell,'refresh')||this.isSheetBtnShow(cell,'otherSave')
-            || this.isSheetBtnShow(cell,'download')||this.isSheetBtnShow(cell,'del')
-    }
-  },
   methods: {
     /* 添加表格 */
     goAddSheetHandle() {
@@ -836,32 +822,6 @@ export default {
       let left = $("#left")[0].offsetWidth;
       let rigtWid = total_wid - left - 20 + "px";
       $("#right")[0].style.width = rigtWid;
-    },
-    //判断右侧列表的下载按钮是否显示
-    isDownLoadShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        const checkMap = {
-            1:etaTablePermission.etaTable_excel_download,
-            2:etaTablePermission.etaTable_customize_data_download,
-            3:etaTablePermission.etaTable_customize_mix_download
-        }
-        return checkPermissionBtn(checkMap[cell.Source])
-    },
-    //判断右侧列表的删除按钮是否显示
-    isDeleteShow(cell){
-        const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        const checkMap = {
-            1:etaTablePermission.etaTable_excel_del,
-            2:etaTablePermission.etaTable_customize_data_del,
-            3:etaTablePermission.etaTable_customize_mix_del
-        }
-        return checkPermissionBtn(checkMap[cell.Source])
-    },
-    //判断自定义表格-编辑,另存为,刷新按钮是否显示
-    isSheetBtnShow(cell,type){
-        console.log('cell',cell.Source)
-        const sheetType = cell.Source===2?'data':'mix'
-        return this.permissionBtn.isShowBtn('etaTablePermission',`etaTable_customize_${sheetType}_${type}`)
     }
   },
   mounted() {