Merge branch 'button-update'

src/utils/buttonConfig.js

@@ -10,6 +10,7 @@ export const checkPermissionBtn = (button_code)=>{
     const buttonCodes = store.state.permissionButton.permissionButtons.map(item=>item.ButtonCode)
     return buttonCodes.includes(button_code)
 }
+
 /*
  * -----------------------------------------------------------------------------研报管理------------------------------------------------
  */
@@ -140,6 +141,9 @@ export const pptPermission ={
     /*--------页面按钮操作-------- */
     ppt_save:'ppt:save',//添加PPT按钮，同时也控制编辑权限
     ppt_merge:'ppt:merge',//合并PPT
+    ppt_addCatalog:'ppt:addCatalog',//添加我的目录
+    ppt_setShare:'ppt:setShare',//设置共享
+    ppt_visible:'ppt:visible',//可见权限
 }
 /*
 *--------英文PPT---------- 
@@ -155,6 +159,9 @@ export const enPPTPermission={
     /*--------页面按钮操作-------- */
     pptEn_save:'pptEn:save',//添加PPT按钮，同时也控制编辑权限
     pptEn_merge:'pptEn:merge',//合并PPT
+    pptEn_addCatalog:'pptEn:addCatalog',
+    pptEn_setShare:'pptEn:setShare',
+    pptEn_visible:'pptEn:visible',
 }
 
 /*
@@ -178,14 +185,28 @@ export const dataSourcePermission = {
     /*--------钢联化工数据库---- */
     mysteelData_refresh:'mysteelData:refresh',//一键刷新
     mysteelData_export:'mysteelData:export',
-    mysteelData_add:'mysteelData:add',
+    mysteelData_add:'mysteelData:add',//新增指标
+    mysteelData_classifyOpt_add:'mysteelData:classifyOpt:add',//添加目录和子项
+    mysteelData_classifyOpt_edit:'mysteelData:classifyOpt:edit',//编辑
+    mysteelData_classifyOpt_delete:'mysteelData:classifyOpt:delete',//删除
     /*--------SMM原始数据库---- */
     smmData_export:'smmData:export',
+    smmData_classifyOpt_add:'smmData:classifyOpt:add',//添加目录和子项
+    smmData_classifyOpt_edit:'smmData:classifyOpt:edit',//编辑
+    smmData_classifyOpt_delete:'smmData:classifyOpt:delete',//删除
+
     /*--------百川盈孚---- */
     bcyfData_edit:'bcyfData:edit',//编辑指标按钮
     bcyfData_export:'bcyfData:export',
+    bcyfData_classifyOpt_add:'bcyfData:classifyOpt:add',//添加目录和子项
+    bcyfData_classifyOpt_edit:'bcyfData:classifyOpt:edit',//编辑
+    bcyfData_classifyOpt_delete:'bcyfData:classifyOpt:delete',//删除
+
     /*--------卓创数据（红桃3）---- */
     hongtao3Data_export:'hongtao3Data:export',
+    hongtao3Data_classifyOpt_add:'hongtao3Data:classifyOpt:add',
+    hongtao3Data_classifyOpt_edit:'hongtao3Data:classifyOpt:edit',
+    hongtao3Data_classifyOpt_delete:'hongtao3Data:classifyOpt:delete',
     /*--------中国煤炭市场网）---- */
     zgmtData_export:'zgmtData:export',
     /*--------EIA  STEO报告---- */
@@ -205,9 +226,15 @@ export const edbDataPermission = {
     edbData_enNameSetting:'edbData:enNameSetting',//设置英文名称
     edbData_edbSource:'edbData:edbSource',//指标溯源
     edbData_copyData:'edbData:copyData',//复制数据
-    edbData_toImgs:'edbData:toImgs',//一键成图
+    /* edbData_toImgs:'edbData:toImgs',//一键成图 */
     edbData_edit:'edbData:edit',//指标编辑，也包括列表项的编辑按钮
     edbData_update:'edbData:update',//更新指标
+    edbData_saveEdb:'edbData:saveEdb',//保存
+    edbData_deleteEdb:'edbData:deleteEdb',//删除
+    edbData_showChartBasis:'edbData:showChartBasis',//展示/隐藏同比图
+    edbData_switchSeason:'edbData:switchSeason',//切换季节性图
+    edbData_editLimit:'edbData:editLimit',//编辑上下限
+    edbData_calculateAgain:'edbData:calculateAgain',//重新计算
     /*------------页面按钮---------- */
     edbData_batchUpdate:'edbData:batchUpdate',//一键更新
     edbData_dataAdjust:'edbData:dataAdjust',//数据调整
@@ -216,6 +243,11 @@ export const edbDataPermission = {
     edbData_calcuEdb:'edbData:calcuEdb',//计算指标
     edbData_addEdb:'edbData:addEdb',//添加指标
     edbData_switchEn:'edbData:switchEn',//切换英文版
+    edbData_classifyOpt_add:'edbData:classifyOpt:add',//添加/编辑分类
+    edbData_classifyOpt_delete:'edbData:classifyOpt:delete',//删除分类
+    edbData_checkRelatedChart:'edbData:checkRelatedChart',//查看关联图表
+    edbData_checkRelatedEdb:'edbData:checkRelatedEdb',//查看关联指标
+    edbData_checkCalcChart:'edbData:checkCalcChart',//查看计算指标
 }
 /*
  * ---------------------------------------------------------------------------ETA预测指标------------------------------------------------
@@ -223,7 +255,7 @@ export const edbDataPermission = {
 export const predictEdbPermission = {
     /*-----------指标详情按钮--------- */
     edbPreData_switchSeason:'edbPreData:switchSeason',//切换季节性图
-    edbPreData_viewData:'edbPreData:viewData',//查看数据
+    /* edbPreData_viewData:'edbPreData:viewData',//查看数据 */
     edbPreData_copyData:'edbPreData:copyData',//复制数据
     edbPreData_del:'edbPreData:del',//删除
     edbPreData_recalcu:'edbPreData:recalcu',//重新计算
@@ -232,10 +264,17 @@ export const predictEdbPermission = {
     edbPreData_update:'edbPreData:update',//更新
     edbPreData_edbSource:'edbPreData:edbSource',//指标溯源
     edbPreData_enNameSetting:'edbPreData:enNameSetting',//设置英文名称
+    edbPreData_editLimit:'edbPreData:editLimit',//编辑上下限
     /*------------页面按钮---------- */
     edbPreData_calcuEdb:'edbPreData:calcuEdb',//计算指标
     edbPreData_addEdb:'edbPreData:addEdb',//添加指标
     edbPreData_switchEn:'edbPreData:switchEn',//切换英文版
+    edbPreData_isOnlyMine:'edbPreData:isOnlyMine',//只看我的
+    edbPreData_classifyOpt_add:'edbPreData:classifyOpt:add',//添加/编辑分类
+    edbPreData_classifyOpt_delete:'edbPreData:classifyOpt:delete',//删除分类
+    edbPreData_checkRelatedChart:'edbPreData:checkRelatedChart',//查看关联图表
+    edbPreData_checkRelatedEdb:'edbPreData:checkRelatedEdb',//查看关联指标
+    edbPreData_checkPreRule:'edbPreData:checkPreRule',//查看预测规则
 }
 
 /*
@@ -255,9 +294,13 @@ export const chartLibPermission = {
     chartLib_refresh:'chartLib:refresh',
     chartLib_addMy:'chartLib:addMy',//加入我的图库
     chartLib_share:'chartLib:share',
+    chartLib_editLimit:'chartLib:editLimit',//编辑上下限
     /*------------页面按钮---------- */
     chartLib_add:'chartLib:add',
     chartLib_switchEn:'chartLib:switchEn',
+    chartLib_isOnlyMine:'chartLib:isOnlyMine',//只看我的
+    chartLib_classifyOpt_add:'chartLib:classifyOpt:add',//新增/编辑分类
+	chartLib_classifyOpt_delete:'chartLib:classifyOpt:delete',//删除分类
 }
 
 /*
@@ -276,8 +319,16 @@ export const myETAPermission = {
     myChart_copyTo:'myChart:copyTo',
     myChart_share:'myChart:share',
     myChart_move:'myChart:move',//移出，同时也控制列表项的移出
+    myChart_copyData:'myChart:copyData',//复制数据
+    myChart_checkData:'myChart:checkData',//查看数据
+    myChart_editLimit:'myChart:editLimit',//编辑上下限
     /*-----------页面按钮--------- */
     myChart_selectChart:'myChart:selectChart',//选择图表
+    myChart_classifyOpt_copy:'myChart:classifyOpt:copy',//复制
+    myChart_classifyOpt_show:'myChart:classifyOpt:show',//可见权限
+    myChart_classifyOpt_edit:'myChart:classifyOpt:edit',//添加我的分类
+    myChart_classifyOpt_rename:'myChart:classifyOpt:rename',//重命名
+    myChart_classifyOpt_delete:'myChart:classifyOpt:delete',//删除
 }
 /*
  * --------------------------------------------------------------------------ETA表格------------------------------------------------
@@ -286,12 +337,27 @@ export const etaTablePermission = {
     /*-----------页面按钮--------- */
     etaTable_customize:'etaTable:customize',//自定义表格这个按钮显示不显示
     etaTable_excel:'etaTable:excel',//添加Excel表格这个按钮显示不显示
+    etaTable_classifyOpt_edit:'etaTable:classifyOpt:edit',//添加编辑表格
+    etaTable_classifyOpt_delete:'etaTable:classifyOpt:delete',//删除表格
+
     /*-----------自定义表格--------- */
-    etaTable_customize_del:'etaTable:customize:del',
+    /* etaTable_customize_del:'etaTable:customize:del',
     etaTable_customize_download:'etaTable:customize:download',
     etaTable_customize_otherSave:'etaTable:customize:otherSave',
     etaTable_customize_refresh:'etaTable:customize:refresh',
-    etaTable_customize_edit:'etaTable:customize:edit',
+    etaTable_customize_edit:'etaTable:customize:edit', */
+    //混合表格
+    etaTable_customize_mix_edit:'etaTable:customize:mix:edit',//编辑
+    etaTable_customize_mix_refresh:'etaTable:customize:mix:refresh',//刷新
+    etaTable_customize_mix_otherSave:'etaTable:customize:mix:otherSave',//另存为
+    etaTable_customize_mix_download:'etaTable:customize:mix:download',//下载
+    etaTable_customize_mix_del:'etaTable:customize:mix:del',//删除
+    //数据表格
+    etaTable_customize_data_edit:'etaTable:customize:data:edit',//编辑
+    etaTable_customize_data_refresh:'etaTable:customize:data:refresh',//刷新
+    etaTable_customize_data_otherSave:'etaTable:customize:data:otherSave',//另存为
+    etaTable_customize_data_download:'etaTable:customize:data:download',//下载
+    etaTable_customize_data_del:'etaTable:customize:data:del',//删除
     /*-----------常规表格--------- */
     etaTable_excel_del:'etaTable:excel:del',
     etaTable_excel_download:'etaTable:excel:download',
@@ -312,8 +378,17 @@ export const sandboxPermission = {
 export const semanticPermission = {
     /*-----------文档管理--------- */
     docPage_save:'docPage:save',//添加编辑文档
+    docPage_delete:'docPage:delete',//删除文档
+    docPage_classifyOpt_edit:'docPage:classifyOpt:edit',//添加编辑分类
+    docPage_classifyOpt_delete:'docPage:classifyOpt:delete',//删除分类
     /*-----------文档对比--------- */
     saPage_save:'saPage:save',//添加编辑对比文档
+    saPage_download:'saPage:download',//下载
+    saPage_copyOffice:'saPage:copyOffice',//复制到Office
+    saPage_copyWeixin:'saPage:copyWeixin',//复制到微信
+    saPage_delete:'saPage:delete',//删除对比文档
+    saPage_classifyOpt_edit:'saPage:classifyOpt:edit',//添加编辑分类
+    saPage_classifyOpt_delete:'saPage:classifyOpt:delete',//删除分类
     /*-----------标签管理--------- */
     tagPage_del:'tagPage:del',
     tagPage_save:'tagPage:save',//添加编辑标签
@@ -326,6 +401,9 @@ export const statisticPermission = {
     corrAnalysis_addChart:'corrAnalysis:addChart',//添加图表按钮
     corrAnalysis_viewData:'corrAnalysis:viewData',//查看表格数据
     corrAnalysis_copyData:'corrAnalysis:copyData',//复制表格数据
+    corrAnalysis_onlyMine:'corrAnalysis:onlyMine',//只看我的
+    corrAnalysis_classifyOpt_edit:'corrAnalysis:classifyOpt:edit',//添加/编辑分类
+    corrAnalysis_classifyOpt_delete:'corrAnalysis:classifyOpt:delete',//删除分类
         /*---图表操作栏--- */
     corrAnalysis_del:'corrAnalysis:del',
     corrAnalysis_enNameSetting:'corrAnalysis:enNameSetting',
@@ -339,6 +417,9 @@ export const statisticPermission = {
 
     /*-----------统计特征--------- */
     statisticFeature_addChart:'statisticFeature:addChart',//添加图表按钮
+    statisticFeature_onlyMine:'statisticFeature:onlyMine',//只看我的
+    statisticFeature_classifyOpt_edit:'statisticFeature:classifyOpt:edit',//添加/编辑分类
+    statisticFeature_classifyOpt_delete:'statisticFeature:classifyOpt:delete',//删除分类
         /*---图表操作栏--- */
     statisticFeature_del:'statisticFeature:del',
     statisticFeature_enNameSetting:'statisticFeature:enNameSetting',
@@ -352,6 +433,9 @@ export const statisticPermission = {
 
     /*-----------拟合方程曲线--------- */
     fittingEq_addChart:'fittingEq:addChart',//添加图表按钮
+    fittingEq_onlyMine:'fittingEq:onlyMine',//只看我的
+    fittingEq_classifyOpt_edit:'fittingEq:classifyOpt:edit',//添加编辑分类
+    fittingEq_classifyOpt_delete:'fittingEq:classifyOpt:delete',//删除分类
         /*---图表操作栏--- */
     fittingEq_del:'fittingEq:del',
     fittingEq_enNameSetting:'fittingEq:enNameSetting',
@@ -378,6 +462,10 @@ export const productPricePermission = {
     /*-----------页面按钮--------- */
     goodsPrice_incomeLine:'goodsPrice:incomeLine',//添加利润曲线
     goodsPrice_priceLine:'goodsPrice:priceLine',//添加价格曲线
+    goodsPrice_classifyOpt_edit:'goodsPrice:classifyOpt:edit',//添加/编辑分类
+    goodsPrice_classifyOpt_delete:'goodsPrice:classifyOpt:delete',//删除分类
+    goodsPrice_onlyMine:'goodsPrice:onlyMine',//只看我的
+    goodsPrice_editLimit:'goodsPrice:editLimit',//编辑上下限
     /* 利润曲线 */
     goodsPrice_incomeLine_del:'goodsPrice:incomeLine:del',
     goodsPrice_incomeLine_enNameSetting:'goodsPrice:incomeLine:enNameSetting',
@@ -411,6 +499,8 @@ export const sysDepartPermission = {
     sysDepart_del:'sysDepart:del',//用户删除
     sysDepart_saveUser_researchGroup:'sysDepart:saveUser:researchGroup',//添加/编辑用户表单中,研究方向的按钮
     sysDepart_saveUser_LabelVal:'sysDepart:saveUser:LabelVal',//姓名角色的标签
+    sysDepart_classifyOpt_edit:'sysDepart:classifyOpt:edit',//添加/编辑部门
+    sysDepart_classifyOpt_delete:'sysDepart:classifyOpt:delete',//删除部门
     /*-----------角色管理-------- */
     sysRole_del:'sysRole:del',//删除角色
     sysRole_settingAuth:'sysRole:settingAuth',//设置/查看权限
@@ -438,6 +528,8 @@ export const operateAuthPermission = {
     /*---------手工数据指标-------- */
     operateAuth_manual:'operateAuth:manual',
     operateAuth_manual_edit:'operateAuth:manual:edit',
+    /*---------手工数据权限-------- */
+    sysdataAuth_classify:'sysdataAuth:classify',//手工指标分类
 }
 /*-----------基本配置-------- */
 export const baseConfigPermission = {
@@ -462,4 +554,57 @@ export const outlinkConfigPermission = {
     outlinkListConfig_add:'outlinkListConfig:add',//添加
     outlinkListConfig_edit:'outlinkListConfig:edit',//编辑
     outlinkListConfig_del:'outlinkListConfig:del',//删除
-}
+}
+
+
+//创建了新的ManageBtn记得添加到这里
+const btnMap  = {
+    reportManageBtn,enReportManageBtn,
+    classifyBtn,enClassifyBtn,authorManage,
+    enChartPermission,cloudDisk,
+    pptPermission,enPPTPermission,
+    dataSourcePermission,
+    edbDataPermission,predictEdbPermission,chartLibPermission,
+    myETAPermission,etaTablePermission,
+    sandboxPermission,semanticPermission,
+    statisticPermission,stockPlantPermission,
+    productPricePermission,sysDepartPermission,
+    operateAuthPermission,baseConfigPermission,
+    outlinkConfigPermission
+}
+
+/**
+ *自定义指令使用示例:
+ * <el-checkbox v-model="isOnlyMe"
+ *  v-permission="permissionBtn.chartLibPermission.chartLib_isOnlyMine"
+ *  >只看我的</el-checkbox>
+ */
+/**
+ * 函数使用示例:
+ *  <span v-if="data.Button.OpButton
+ *      &&permissionBtn.isShowBtn('chartLibPermission','chartLib_add')">
+ *  </span>
+ *  <el-input 
+ *      :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib:editLimit')"
+ *      v-model="tableData[leftIndex].MaxData"/>
+ * computed:{ 
+ *  //是否显示公共图库的下拉按钮
+    isShowDropPublic(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_copy')
+    },
+ * }
+*/
+/** 
+ * 根据权限判断按钮是否展示
+ * 适用于dom本身就有v-if/show条件限制的情况,可以防止自定义指令冲突
+ * 适用于限制表单,组件disabled的情况
+ * @param {String} btnMapName 按钮所属的模块名
+ * @param {String} btnKey 按钮对应的key
+ * @returns Boolean
+ */
+ export const isShowBtn = (btnMapName,btnKey)=>{
+    return btnMap[btnMapName]&&checkPermissionBtn(btnMap[btnMapName][btnKey])
+}
+/* export const getBtnCode = (btnMapName,btnKey)=>{
+    return (btnMap[btnMapName]&&btnMap[btnMapName][btnKey])||''
+} */

src/views/chartRelevance_manage/fittingEquationList.vue

@@ -29,7 +29,9 @@
 				</div>
 
 				<div class="search-cont">
-					<el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
+					<el-checkbox v-model="isShowMe"  
+						v-permission="permissionBtn.statisticPermission.fittingEq_onlyMine"
+						@change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
 					<el-select
 						v-model="search_txt"
 						v-loadMore="searchLoad"
@@ -81,11 +83,11 @@
 								placeholder="请输入值"
 								class="label-input"
 								v-model="new_label"
-								v-if="data.isEdit"
+								v-if="data.isEdit&&permissionBtn.isShowBtn('statisticPermission','fittingEq_classifyOpt_edit')"
 								@blur="changeValue(data)"
 							/>
 							<span
-								@dblclick.stop="editNodeLabel(data)"
+								@dblclick.stop="handleDblClick(data)"
 								v-else
 								class="text_oneLine node_label"
 								:style="`width:${
@@ -108,7 +110,7 @@
 									alt=""
 									style="width: 15px; height: 14px; margin-right: 8px"
 									@click.stop="editNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','fittingEq_classifyOpt_edit')"
 								/>
 								<img
 									slot="reference"
@@ -116,7 +118,7 @@
 									alt=""
 									style="width: 14px; height: 14px"
 									@click.stop="removeNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','fittingEq_classifyOpt_delete')"
 								/>
 							</span>
 						</span>
@@ -124,6 +126,7 @@
 					<div
 						class="noDepart"
 						@click="addLevelOneHandle"
+						v-if="permissionBtn.isShowBtn('statisticPermission','fittingEq_classifyOpt_edit')"
 					>
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
@@ -609,6 +612,10 @@ export default {
       });
       this.copyBlobItem(widthNum,heightNum,svg,type);
     },500),
+		handleDblClick(data){
+			if(!this.permissionBtn.isShowBtn('statisticPermission','fittingEq_classifyOpt_edit')) return
+			this.editNodeLabel(data)
+		}
 	},
 	mounted() {
 

src/views/chartRelevance_manage/list.vue

@@ -19,6 +19,7 @@
         >
           <span>目录</span>
           <el-checkbox v-model="isOnlyMe" @change="onlyMeHandler"
+            v-permission="permissionBtn.statisticPermission.corrAnalysis_onlyMine"
             >只看我的</el-checkbox
           >
         </div>
@@ -84,11 +85,11 @@
                 placeholder="请输入值"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit"
+                v-if="data.isEdit&&permissionBtn.isShowBtn('statisticPermission','corrAnalysis_classifyOpt_edit')"
                 @blur="changeValue(data)"
               />
               <span
-                @dblclick.stop="editNodeLabel(data)"
+                @dblclick.stop="handleDblclick(data)"
                 v-else
                 class="text_oneLine node_label"
                 :style="`width:${
@@ -111,7 +112,7 @@
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ChartInfoId"
+                  v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','corrAnalysis_classifyOpt_edit')"
                 />
                 <img
                   slot="reference"
@@ -119,12 +120,12 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ChartInfoId"
+                  v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','corrAnalysis_classifyOpt_delete')"
                 />
               </span>
             </span>
           </el-tree>
-          <div class="noDepart" @click="addLevelOneHandle">
+          <div class="noDepart" @click="addLevelOneHandle" v-if="permissionBtn.isShowBtn('statisticPermission','corrAnalysis_classifyOpt_edit')">
             <img
               src="~@/assets/img/set_m/add_ico.png"
               alt=""
@@ -721,6 +722,10 @@ export default {
         // console.log(svg);
         this.copyBlobItem(widthNum, heightNum, svg, type);
     }, 500),
+    handleDblclick(data){
+        if(!this.permissionBtn.isShowBtn('statisticPermission','corrAnalysis_classifyOpt_edit')) return
+        this.editNodeLabel(data)
+    }
   },
   mounted() {
     if (this.$route.query.code) {

src/views/chartRelevance_manage/statisticFeatureList.vue

@@ -16,7 +16,9 @@
 				</div>
 
 				<div class="search-cont">
-					<el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
+					<el-checkbox v-model="isShowMe"  
+						v-permission="permissionBtn.statisticPermission.statisticFeature_onlyMine"
+						@change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
 					<el-select
 						v-model="search_txt"
 						v-loadMore="searchLoad"
@@ -68,11 +70,11 @@
 								placeholder="请输入值"
 								class="label-input"
 								v-model="new_label"
-								v-if="data.isEdit"
+								v-if="data.isEdit&&permissionBtn.isShowBtn('statisticPermission','statisticFeature_classifyOpt_edit')"
 								@blur="changeValue(data)"
 							/>
 							<span
-								@dblclick.stop="editNodeLabel(data)"
+								@dblclick.stop="handleDblClick(data)"
 								v-else
 								class="text_oneLine node_label"
 								:style="`width:${
@@ -95,7 +97,7 @@
 									alt=""
 									style="width: 15px; height: 14px; margin-right: 8px"
 									@click.stop="editNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','statisticFeature_classifyOpt_edit')"
 								/>
 								<img
 									slot="reference"
@@ -103,13 +105,13 @@
 									alt=""
 									style="width: 14px; height: 14px"
 									@click.stop="removeNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','statisticFeature_classifyOpt_delete')"
 								/>
 							</span>
 						</span>
 					</el-tree>
 					<div
-						class="noDepart"
+						class="noDepart" v-if="permissionBtn.isShowBtn('statisticPermission','statisticFeature_classifyOpt_edit')"
 						@click="addLevelOneHandle"
 					>
 						<img
@@ -578,6 +580,10 @@ export default {
       });
       this.copyBlobItem(widthNum,heightNum,svg,type);
     },500),
+		handleDblClick(data){
+			if(!this.permissionBtn.isShowBtn('statisticPermission','statisticFeature_classifyOpt_edit')) return 
+			this.editNodeLabel(data)
+		}
 	},
 	mounted() {
 

src/views/dataEntry_manage/chartSetting.vue

@@ -32,7 +32,9 @@
         <ul class="left-tab">
           <li :class="['tab',{'act': leftShowLabel===tab}]" v-for="tab in ['目录','坐标轴']" :key="tab" @click="leftShowLabel=tab">{{tab}}</li>
           <li >
-            <el-checkbox v-model="isOnlyMe"  @change="onlyMeHandler">只看我的</el-checkbox>
+            <el-checkbox v-model="isOnlyMe" 
+                v-permission="permissionBtn.chartLibPermission.chartLib_isOnlyMine"
+                @change="onlyMeHandler">只看我的</el-checkbox>
           </li>
         </ul>
 
@@ -92,7 +94,7 @@
                   placeholder="请输入值"
                   class="label-input"
                   v-model="new_label"
-                  v-if="data.isEdit"
+                  v-if="data.isEdit&&permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')"
                   @blur="changeValue(node, data)"
                 />
                 <span
@@ -116,27 +118,30 @@
                     style="width: 14px; height: 14px; margin-right: 8px"
                     v-if="data.Button.MoveButton"
                   />
+                  <!-- 添加子项 -->
                   <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.Button.AddButton"
+                    v-if="data.Button.AddButton&&permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')"
                   />
+                  <!-- 编辑子项 -->
                   <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.Button.OpButton"
+                    v-if="data.Button.OpButton&&permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')"
                   />
+                  <!-- 删除子项 -->
                   <img
                     slot="reference"
                     src="~@/assets/img/set_m/del.png"
                     alt=""
                     style="width: 14px; height: 14px"
                     @click.stop="removeNode(node, data)"
-                    v-if="data.Button.DeleteButton"
+                    v-if="data.Button.DeleteButton&&permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_delete')"
                   />
                 </span>
               </span>
@@ -144,7 +149,7 @@
             <div
               class="noDepart"
               @click="addLevelOneHandle"
-              v-if="CanOpClassify"
+              v-if="CanOpClassify&&permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')"
             >
               <img
                 src="~@/assets/img/set_m/add_ico.png"
@@ -373,6 +378,7 @@
                         size="mini"
                         type="number"
                         placeholder="上限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[leftIndex].MaxData"
                       />
                       <el-input
@@ -380,6 +386,7 @@
                         size="mini"
                         type="number"
                         placeholder="下限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[leftIndex].MinData"
                       />
                     </div>
@@ -392,6 +399,7 @@
                         size="mini"
                         type="number"
                         placeholder="上限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightIndex].MaxData"
                       />
                       <el-input
@@ -399,6 +407,7 @@
                         size="mini"
                         type="number"
                         placeholder="下限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightIndex].MinData"
                       />
                     </div>
@@ -410,6 +419,7 @@
                         size="mini"
                         type="number"
                         placeholder="上限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightTwoIndex].MaxData"
                       />
                       <el-input
@@ -417,6 +427,7 @@
                         size="mini"
                         type="number"
                         placeholder="下限"
+                        :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightTwoIndex].MinData"
                       />
                     </div>
@@ -429,6 +440,7 @@
                           size="mini"
                           type="number"
                           placeholder="上限"
+                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.max"
                           @change="changeLimit"
                         />
@@ -437,6 +449,7 @@
                           size="mini"
                           type="number"
                           placeholder="下限"
+                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.min"
                           @change="changeLimit"
                         />
@@ -448,6 +461,7 @@
                           size="mini"
                           type="number"
                           placeholder="下限"
+                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.x_min"
                           @change="changeLimit"
                         />
@@ -456,6 +470,7 @@
                           size="mini"
                           type="number"
                           placeholder="上限"
+                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.x_max"
                           @change="changeLimit"
                         />
@@ -1072,7 +1087,7 @@ export default {
     /* 双击label出现input修改框 */
     editNodeLabel(node, data) {
       //目录名称可以双击修改 指标不能
-      if (!data.ChartInfoId && data.Button.OpButton) {
+      if (!data.ChartInfoId && data.Button.OpButton&&this.permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')) {
         this.$set(data, 'isEdit', true);
         this.new_label = data.ChartClassifyName;
         this.$nextTick(() => {

src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -15,7 +15,7 @@
 				<el-button type="primary" plain size="mini" class="btn-sty" @click="openDateDia">{{
 					dateTip
 				}}</el-button>
-				<el-button type="primary" plain size="mini" class="btn-sty" @click="showOnChart('toggle')" v-if="!isOnlyShowBaseChart">
+				<el-button type="primary" plain size="mini" class="btn-sty" @click="showOnChart('toggle')" v-if="!isOnlyShowBaseChart&&isShowChartBasis">
 					<!-- <i class="el-icon-view"></i> -->
 					{{ isShowOnyearData ? '隐藏同比图' : '展示同比图'}}
 				</el-button>
@@ -35,7 +35,7 @@
 				{{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
 			</div>
 			<el-button type="primary" plain size="mini" class="btn-sty" style="margin-left:auto;"
-				@click="chartTypeChange" v-if="!isOnlyShowBaseChart">
+				@click="chartTypeChange" v-if="!isOnlyShowBaseChart&&isAllowSwitchSeason">
 				<i class="el-icon-sort" style="transform: rotate(90deg);"></i>
 				切换{{chart_type==1?'季节性图':'曲线图'}}
 			</el-button>
@@ -49,6 +49,7 @@
 						size="mini"
 						type="number"
 						placeholder="上限"
+						:disabled="!isAllowEditLimit"
 						v-model="chartInfo.MaxValue"
 						@change="() => { chart_type===1?setOptions():setSeasonOptions() }"
 					/>
@@ -57,6 +58,7 @@
 						size="mini"
 						type="number"
 						placeholder="下限"
+						:disabled="!isAllowEditLimit"
 						v-model="chartInfo.MinValue"
 						@change="() => { chart_type===1?setOptions():setSeasonOptions() }"
 					/>
@@ -68,6 +70,7 @@
 						type="number"
 						placeholder="上限"
 						v-model="limitData.rightMax"
+						:disabled="!isAllowEditLimit"
 						@change="changeLimit"
 					/>
 					<el-input
@@ -76,6 +79,7 @@
 						type="number"
 						placeholder="下限"
 						v-model="limitData.rightMin"
+						:disabled="!isAllowEditLimit"
 						@change="changeLimit"
 					/>
 				</div>
@@ -123,6 +127,18 @@ export default {
 		chartLang:{
 			type: String,
 			default:()=> 'ch'
+		},
+		isShowChartBasis:{
+			type:Boolean,
+			default:false
+		},
+		isAllowSwitchSeason:{
+			type:Boolean,
+			default:false
+		},
+		isAllowEditLimit:{
+			type:Boolean,
+			default:false
 		}
 	},
 	computed: {

src/views/dataEntry_manage/databaseList.vue

@@ -90,7 +90,7 @@
 								placeholder="请输入值"
 								class="label-input"
 								v-model="new_label"
-								v-if="data.isEdit"
+								v-if="data.isEdit&&isEdbBtnShow('editCatalog')"
 								@blur="changeValue(node, data)"
 							/>
 							<span 
@@ -112,40 +112,46 @@
 									style="width: 14px; height: 14px; margin-right: 8px"
 									v-if="data.Button.MoveButton"
 								/>
+								<!-- 添加子项 -->
 								<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.Button.AddButton"
+									v-if="data.Button.AddButton&&isEdbBtnShow('editCatalog')"
 								/>
-								<!--如果是分类，判断data.Button.OpButton不变；如果是指标，不显示(ETA1.0.3)-->
+								<!--编辑节点 如果是分类，判断data.Button.OpButton不变；如果是指标，不显示(ETA1.0.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.EdbCode&&(data.Button.OpButton)"
+									v-if="!data.EdbCode&&(data.Button.OpButton)&&isEdbBtnShow('editCatalog')"
 								/>
-								<!--如果是分类，判断data.Button.DeleteButton不变；如果是指标，不显示(ETA1.0.3)-->
+								<!-- 删除节点 如果是分类，判断data.Button.DeleteButton不变；如果是指标，不显示(ETA1.0.3)-->
 								<img
 									slot="reference"
 									src="~@/assets/img/set_m/del.png"
 									alt=""
 									style="width: 14px; height: 14px;"
 									@click.stop="removeNode(node,data)"
-									v-if="!data.EdbCode&&(data.Button.DeleteButton)"
+									v-if="!data.EdbCode&&(data.Button.DeleteButton)&&isEdbBtnShow('deleteCatalog')"
 								/>
-								<i class="el-icon-view" v-if="data.EdbType===2&&![58,59,67,68].includes(data.Source)" @click.stop="viewNode(node,data)"></i>
+								<!-- 查看计算指标 -->
+								<i class="el-icon-view" 
+									v-if="data.EdbType===2&&![58,59,67,68].includes(data.Source)&&isEdbBtnShow('checkCalcChart')" 
+									@click.stop="viewNode(node,data)"></i>
+								<!-- 查看关联图表 -->
 								<img 
-									v-if="data.Button.ShowChartRelation" 
+									v-if="data.Button.ShowChartRelation&&isEdbBtnShow('checkRelatedChart')" 
 									@click.stop="showAssociateChart=true,showAssociateComputeData=false"
 									src="~@/assets/img/icons/associate_chart.png" 
 									style="width: 14px; height: 14px;margin-left: 8px"
 									alt=""
 								/>
+								<!-- 查看关联指标 -->
 								<img 
-									v-if="data.Button.ShowEdbRelation" 
+									v-if="data.Button.ShowEdbRelation&&isEdbBtnShow('checkRelatedEdb')" 
 									@click.stop="showAssociateComputeData=true,showAssociateChart=false"
 									src="~@/assets/img/icons/associate_data.png" 
 									style="width: 14px; height: 14px;margin-left: 8px"
@@ -154,7 +160,7 @@
 							</span>
 						</span>
 					</el-tree>
-					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify">
+					<div class="noDepart" @click="addLevelOneHandle" v-if="CanOpClassify&&isEdbBtnShow('editCatalog')">
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
 							alt=""
@@ -223,13 +229,13 @@
 								},EdbData)"
 							>编辑</el-button>
 						<!-- 指保存指标的上下限，在走势图才显示 -->
-						<el-button v-if="activeTab==='Chart'"
+						<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
 							type="text" @click.stop="saveEdbLimit">保存</el-button>
 						<el-button v-if="isEdbBtnShow('setEn')"
 							type="text" @click="openEnNameDia">设置英文名称</el-button>
 						<el-button v-if="EdbData.Button.InsertNewDataButton&&isEdbBtnShow('newValue')"
 							type="text" @click.stop="updateNewestDataHandle" >{{(EdbData.DataInsertConfig.Date)?'编辑最新值':'添加最新值'}}</el-button>
-						<el-button v-if="EdbData.EdbType===2"
+						<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('calculateAgain')"
 							type="text" @click.stop="reCalculateHandler" :loading="calculateLoading">重新计算</el-button>
 						<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
 							type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
@@ -237,7 +243,7 @@
 							type="text" @click.stop="refreshBaseHandler" :loading="refreshLoading">全部刷新</el-button>
 						<el-button v-if="isEdbBtnShow('copyData')"
 							type="text" @click="copyCode">复制数据</el-button>
-						<el-button v-if="EdbData.Button.DeleteButton"
+						<el-button v-if="EdbData.Button.DeleteButton&&isEdbBtnShow('deleteEdb')"
 							type="text" @click="removeNode(_,EdbData)" style="color:#C54322;">删除</el-button>
 					</div>
 				</div>
@@ -246,6 +252,9 @@
 						<chart-trend-render
 							:edbid="selected_edbid"
 							:chartLang="currentLang"
+							:isShowChartBasis="isEdbBtnShow('showChartBasis')"
+							:isAllowSwitchSeason="isEdbBtnShow('switchSeason')"
+							:isAllowEditLimit="isEdbBtnShow('editLimit')"
 							ref="createChart"
 							@editEnName="openEnNameDia"/>
 						<div class="info">
@@ -769,18 +778,30 @@ export default {
 		}
 	},
 	methods: {
-		//控制指标详情操作按钮
+		//控制页面按钮权限
 		isEdbBtnShow(type){
 			const {edbDataPermission,checkPermissionBtn}=this.permissionBtn
 			const BtnMap = {
-				'update':edbDataPermission.edbData_update,
-				'edit':edbDataPermission.edbData_edit,
-				'toImg':edbDataPermission.edbData_toImgs,
-				'copyData':edbDataPermission.edbData_copyData,
-				'toSource':edbDataPermission.edbData_edbSource,
-				'setEn':edbDataPermission.edbData_enNameSetting,
-				'newValue':edbDataPermission.edbData_newestValue,
-				'refreshAll':edbDataPermission.edbData_refreshAll,
+				'update':edbDataPermission.edbData_update,//指标更新
+				'edit':edbDataPermission.edbData_edit,//指标编辑
+				/* 'toImg':edbDataPermission.edbData_toImgs, */
+				'copyData':edbDataPermission.edbData_copyData,//复制数据
+				'toSource':edbDataPermission.edbData_edbSource,//指标溯源
+				'setEn':edbDataPermission.edbData_enNameSetting,//设置英文名称
+				'newValue':edbDataPermission.edbData_newestValue,//添加/编辑最新值
+				'refreshAll':edbDataPermission.edbData_refreshAll,//全部刷新
+				'saveEdb':edbDataPermission.edbData_saveEdb,//保存指标
+				'deleteEdb':edbDataPermission.edbData_deleteEdb,//删除指标
+				'showChartBasis':edbDataPermission.edbData_showChartBasis,//展示/隐藏同比图
+				'switchSeason':edbDataPermission.edbData_switchSeason,//切换季节性图
+				'editLimit':edbDataPermission.edbData_editLimit,//编辑上下限
+				'calculateAgain':edbDataPermission.edbData_calculateAgain,//重新计算
+
+				'editCatalog':edbDataPermission.edbData_classifyOpt_add,//添加编辑目录
+				'deleteCatalog':edbDataPermission.edbData_classifyOpt_delete,//删除目录
+				'checkRelatedChart':edbDataPermission.edbData_checkRelatedChart,//查看关联图表
+				'checkRelatedEdb':edbDataPermission.edbData_checkRelatedEdb,//查看关联指标
+				'checkCalcChart':edbDataPermission.edbData_checkCalcChart,//查看计算指标
 			}
 			return checkPermissionBtn(BtnMap[type])
 		},
@@ -1096,7 +1117,7 @@ export default {
 		/* 双击label出现input修改框 */
 		editNodeLabel(node, data) {
 			//目录名称可以双击修改 指标不能
-			if(!data.EdbCode && this.role === 'admin') {
+			if(!data.EdbCode && this.role === 'admin'&&this.isEdbBtnShow('editCatalog')) {
 				this.$set(data,'isEdit',true)
 				this.new_label = data.ClassifyName;
 				this.$nextTick(() => {

src/views/dataEntry_manage/thirdBase/BAIINFOTargetbase.vue

@@ -78,12 +78,12 @@
                 src="~@/assets/img/set_m/add.png"
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('add', data, node)"
-                v-if="data.Button.AddButton"
+                v-if="data.Button.AddButton&&permissionBtn.isShowBtn('dataSourcePermission','bcyfData_classifyOpt_add')"
               />
               <img
                 v-permission="permissionBtn.dataSourcePermission.bcyfData_edit"
                 src="~@/assets/img/set_m/edit.png"
-                v-if="data.Button.OpButton"
+                v-if="data.Button.OpButton&&permissionBtn.isShowBtn('dataSourcePermission','bcyfData_classifyOpt_edit')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('edit', data, node)"
@@ -97,14 +97,14 @@
               />
               <img
                 src="~@/assets/img/set_m/del.png"
-                v-if="data.Button.DeleteButton"
+                v-if="data.Button.DeleteButton&&permissionBtn.isShowBtn('dataSourcePermission','bcyfData_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px"
                 @click.stop="clickClassifyHandle('del', data, node)"
               />
               <img
                 src="~@/assets/img/set_m/del_icon.png"
-                v-if="data.Button.targetDelButton"
+                v-if="data.Button.targetDelButton&&permissionBtn.isShowBtn('dataSourcePermission','bcyfData_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('delTarget', data, node)"
@@ -113,7 +113,7 @@
           </div>
         </el-tree>
 
-        <div class="add-cont" @click="addClassifyHandle">
+        <div class="add-cont" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('dataSourcePermission','bcyfData_classifyOpt_add')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""

src/views/dataEntry_manage/thirdBase/SCITargetbase.vue

@@ -78,11 +78,11 @@
                 src="~@/assets/img/set_m/add.png"
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('add', data, node)"
-                v-if="data.Button.AddButton"
+                v-if="data.Button.AddButton&&permissionBtn.isShowBtn('dataSourcePermission','hongtao3Data_classifyOpt_add')"
               />
               <img
                 src="~@/assets/img/set_m/edit.png"
-                v-if="data.Button.OpButton"
+                v-if="data.Button.OpButton&&permissionBtn.isShowBtn('dataSourcePermission','hongtao3Data_classifyOpt_edit')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('edit', data, node)"
@@ -96,14 +96,14 @@
               />
               <img
                 src="~@/assets/img/set_m/del.png"
-                v-if="data.Button.DeleteButton"
+                v-if="data.Button.DeleteButton&&permissionBtn.isShowBtn('dataSourcePermission','hongtao3Data_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px"
                 @click.stop="clickClassifyHandle('del', data, node)"
               />
               <img
                 src="~@/assets/img/set_m/del_icon.png"
-                v-if="data.Button.targetDelButton"
+                v-if="data.Button.targetDelButton&&permissionBtn.isShowBtn('dataSourcePermission','hongtao3Data_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('delTarget', data, node)"
@@ -112,7 +112,7 @@
           </div>
         </el-tree>
 
-        <div class="add-cont" @click="addClassifyHandle">
+        <div class="add-cont" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('dataSourcePermission','hongtao3Data_classifyOpt_add')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""

src/views/dataEntry_manage/thirdBase/smmTargetbase.vue

@@ -91,11 +91,11 @@
                 src="~@/assets/img/set_m/add.png"
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('add', data, node)"
-                v-if="data.Button.AddButton"
+                v-if="data.Button.AddButton&&permissionBtn.isShowBtn('dataSourcePermission','smmData_classifyOpt_add')"
               />
               <img
                 src="~@/assets/img/set_m/edit.png"
-                v-if="data.Button.OpButton"
+                v-if="data.Button.OpButton&&permissionBtn.isShowBtn('dataSourcePermission','smmData_classifyOpt_edit')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('edit', data, node)"
@@ -109,14 +109,14 @@
               />
               <img
                 src="~@/assets/img/set_m/del.png"
-                v-if="data.Button.DeleteButton"
+                v-if="data.Button.DeleteButton&&permissionBtn.isShowBtn('dataSourcePermission','smmData_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px"
                 @click.stop="clickClassifyHandle('del', data, node)"
               />
               <img
                 src="~@/assets/img/set_m/del_icon.png"
-                v-if="data.Button.targetDelButton"
+                v-if="data.Button.targetDelButton&&permissionBtn.isShowBtn('dataSourcePermission','smmData_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('delTarget', data, node)"
@@ -125,7 +125,7 @@
           </div>
         </el-tree>
 
-        <div class="add-cont" @click="addClassifyHandle">
+        <div class="add-cont" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('dataSourcePermission','smmData_classifyOpt_add')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""

src/views/dataEntry_manage/thirdBase/steelChemicalbase.vue

@@ -85,18 +85,18 @@
                 src="~@/assets/img/set_m/add.png"
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('add', data, node)"
-                v-if="data.Button.AddButton"
+                v-if="data.Button.AddButton&&permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_add')"
               />
               <img
                 src="~@/assets/img/set_m/edit.png"
-                v-if="data.Button.OpButton"
+                v-if="data.Button.OpButton&&permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_edit')"
                 alt=""
                 style="width: 14px; height: 14px; margin-right: 5px"
                 @click.stop="clickClassifyHandle('edit', data, node)"
               />
               <img
                 src="~@/assets/img/set_m/del.png"
-                v-if="data.Button.DeleteButton"
+                v-if="data.Button.DeleteButton&&permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_delete')"
                 alt=""
                 style="width: 14px; height: 14px"
                 @click.stop="clickClassifyHandle('del', data, node)"
@@ -105,7 +105,7 @@
           </div>
         </el-tree>
 
-        <div class="add-cont" @click="addClassifyHandle">
+        <div class="add-cont" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('dataSourcePermission','mysteelData_classifyOpt_add')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -85,7 +85,7 @@ export default {
 		editNodeLabel(data,type='') {
       if(type === 'edit-tit') {
         if([2,3].includes(this.sheetDetailInfo.Source)) return
-        
+        if(!this.permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')) return
         this.$set(data,'isEditTit',true)
         this.sheet_title = data.ExcelName;
         this.$nextTick(() => {

src/views/datasheet_manage/sheetList.vue

@@ -14,14 +14,14 @@
             type="primary" style="margin-right:20px" @click="goAddSheetHandle(1)"
           >添加Excel表格</el-button >
 
-          <el-dropdown v-permission="permissionBtn.etaTablePermission.etaTable_customize"
+          <el-dropdown v-if="isShowDataSheet||isShowMixSheet"
             @command="goAddSheetHandle">
             <el-button type="primary">
               自定义表格<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="2">数据表格</el-dropdown-item>
-              <el-dropdown-item :command="3">混合表格</el-dropdown-item>
+              <el-dropdown-item :command="2" v-if="isShowDataSheet">数据表格</el-dropdown-item>
+              <el-dropdown-item :command="3" v-if="isShowMixSheet">混合表格</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -77,7 +77,7 @@
                 placeholder="请输入值"
                 class="label-input"
                 v-model="new_label"
-                v-if="data.isEdit"
+                v-if="data.isEdit&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')"
                 @blur="changeValue(data)"
               />
               <span
@@ -104,7 +104,7 @@
                   alt=""
                   style="width: 15px; height: 14px; margin-right: 8px"
                   @click.stop="editNode(node, data)"
-                  v-if="!data.ExcelInfoId"
+                  v-if="!data.ExcelInfoId&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')"
                 />
                 <img
                   slot="reference"
@@ -112,12 +112,12 @@
                   alt=""
                   style="width: 14px; height: 14px"
                   @click.stop="removeNode(node, data)"
-                  v-if="!data.ExcelInfoId"
+                  v-if="!data.ExcelInfoId&&permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_delete')"
                 />
               </span>
             </span>
           </el-tree>
-          <div class="noDepart" @click="addLevelOneHandle">
+          <div class="noDepart" @click="addLevelOneHandle" v-if="permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')">
             <img
               src="~@/assets/img/set_m/add_ico.png"
               alt=""
@@ -171,7 +171,7 @@
                 @click="saveHandle"
                 v-if="
                   sheetDetailInfo.Source === 1 &&
-                  sheetDetailInfo.Button.OpButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_excel_save)
+                  sheetDetailInfo.Button.OpButton&&isSheetBtnShow(sheetDetailInfo,'save')
                 "
               >
                 保存
@@ -180,21 +180,21 @@
                 <li
                   class="editsty"
                   @click="goEditHandle"
-                  v-if="sheetDetailInfo.Button.OpButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_edit)"
+                  v-if="sheetDetailInfo.Button.OpButton&&isSheetBtnShow(sheetDetailInfo,'edit')"
                 >
                   编辑
                 </li>
                 <li
                   class="editsty"
                   @click="refreshSheet"
-                  v-if="sheetDetailInfo.Button.RefreshButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_refresh)"
+                  v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow(sheetDetailInfo,'refresh')"
                 >
                   刷新
                 </li>
                 <li
                   class="editsty"
                   @click="saveOtherHandle"
-                  v-if="sheetDetailInfo.Button.CopyButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_otherSave)"
+                  v-if="sheetDetailInfo.Button.CopyButton&&isSheetBtnShow(sheetDetailInfo,'otherSave')"
                 >
                   另存为
                 </li>
@@ -477,6 +477,20 @@ 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(type) {
@@ -864,21 +878,29 @@ export default {
     //判断右侧列表的下载按钮是否显示
     isDownLoadShow(cell){
         const {checkPermissionBtn,etaTablePermission} = this.permissionBtn
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_download)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_download)
+        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
-        if(cell.Source===1){
-            return checkPermissionBtn(etaTablePermission.etaTable_excel_del)
-        }else{
-            return checkPermissionBtn(etaTablePermission.etaTable_customize_del)
+        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() {
     if (this.$route.query.code) {

src/views/futures_manage/commodityChartBase.vue

@@ -18,7 +18,9 @@
 				</div>
 
 				<div class="search-cont">
-					<el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
+					<el-checkbox v-model="isShowMe"  
+						v-if="permissionBtn.isShowBtn('productPricePermission','goodsPrice_onlyMine')"
+						@change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
 					<el-select
 						v-model="search_txt"
 						v-loadMore="searchLoad"
@@ -70,11 +72,11 @@
 								placeholder="请输入值"
 								class="label-input"
 								v-model="new_label"
-								v-if="data.isEdit"
+								v-if="data.isEdit&&permissionBtn.isShowBtn('productPricePermission','goodsPrice_classifyOpt_edit')"
 								@blur="changeValue(data)"
 							/>
 							<span
-								@dblclick.stop="editNodeLabel(data)"
+								@dblclick.stop="handleDblClick(data)"
 								v-else
 								class="text_oneLine node_label"
 								:style="`width:${
@@ -97,7 +99,7 @@
 									alt=""
 									style="width: 15px; height: 14px; margin-right: 8px"
 									@click.stop="editNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('productPricePermission','goodsPrice_classifyOpt_edit')"
 								/>
 								<img
 									slot="reference"
@@ -105,7 +107,7 @@
 									alt=""
 									style="width: 14px; height: 14px"
 									@click.stop="removeNode(node, data)"
-									v-if="!data.ChartInfoId"
+									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('productPricePermission','goodsPrice_classifyOpt_delete')"
 								/>
 							</span>
 						</span>
@@ -113,6 +115,7 @@
 					<div
 						class="noDepart"
 						@click="addLevelOneHandle"
+						v-if="permissionBtn.isShowBtn('productPricePermission','goodsPrice_classifyOpt_edit')"
 					>
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
@@ -160,6 +163,7 @@
                         size="mini"
                         type="number"
                         placeholder="上限"
+                        :disabled="!permissionBtn.isShowBtn('productPricePermission','goodsPrice_editLimit')"
                         v-model="chartLimit.max"
                         @change="setCommodityChart"
                       />
@@ -168,6 +172,7 @@
                         size="mini"
                         type="number"
                         placeholder="下限"
+                        :disabled="!permissionBtn.isShowBtn('productPricePermission','goodsPrice_editLimit')"
                         v-model="chartLimit.min"
                         @change="setCommodityChart"
                       />
@@ -789,6 +794,10 @@ export default {
       $('#right')[0].style.width = rigtWid;
 
     },
+	handleDblClick(data){
+		if(!this.permissionBtn.isShowBtn('productPricePermission','goodsPrice_classifyOpt_edit')) return
+		this.editNodeLabel(data)
+	}
 	},
 	mounted() {
 

src/views/mychart_manage/components/chartDetailDia.vue

@@ -220,6 +220,7 @@
                     size="mini"
                     type="number"
                     placeholder="上限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[leftIndex].MaxData"
                   />
                   <el-input
@@ -227,6 +228,7 @@
                     size="mini"
                     type="number"
                     placeholder="下限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[leftIndex].MinData"
                   />
                 </div>
@@ -236,6 +238,7 @@
                     size="mini"
                     type="number"
                     placeholder="上限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[rightIndex].MaxData"
                   />
                   <el-input
@@ -243,6 +246,7 @@
                     size="mini"
                     type="number"
                     placeholder="下限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[rightIndex].MinData"
                   />
                 </div>
@@ -254,6 +258,7 @@
                     size="mini"
                     type="number"
                     placeholder="上限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[rightTwoIndex].MaxData"
                   />
                   <el-input
@@ -261,6 +266,7 @@
                     size="mini"
                     type="number"
                     placeholder="下限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[rightTwoIndex].MinData"
                   />
                 </div>
@@ -273,6 +279,7 @@
                       size="mini"
                       type="number"
                       placeholder="上限"
+                      :disabled="!isAllowEditLimit"
                       v-model="chartLimit.max"
                       @change="changeLimit"
                     />
@@ -281,6 +288,7 @@
                       size="mini"
                       type="number"
                       placeholder="下限"
+                      :disabled="!isAllowEditLimit"
                       v-model="chartLimit.min"
                       @change="changeLimit"
                     />
@@ -292,6 +300,7 @@
                       size="mini"
                       type="number"
                       placeholder="下限"
+                      :disabled="!isAllowEditLimit"
                       v-model="chartLimit.x_min"
                       @change="changeLimit"
                     />
@@ -300,6 +309,7 @@
                       size="mini"
                       type="number"
                       placeholder="上限"
+                      :disabled="!isAllowEditLimit"
                       v-model="chartLimit.x_max"
                       @change="changeLimit"
                     />
@@ -444,11 +454,11 @@
                     </el-select>
                   </div>
                   <div class="copy-excel">
-                    <span class="editsty" @click="copyCode(props.row)">
+                    <span class="editsty" @click="copyCode(props.row)" v-if="isAllowCopyData">
                       <i class="el-icon-document-copy" />&nbsp;复制数据</span
                     >
                     <span 
-                      class="editsty" 
+                      class="editsty" v-if="isAllowCheckData"
                       @click="viewTarget(props.row)"
                       style="display:block;margin-top:15px;"
                     >&nbsp;查看数据</span>
@@ -485,10 +495,10 @@
               width="110"
             >
               <template slot-scope="scope">
-                <span class="editsty" @click="copyCode(scope.row)">
+                <span class="editsty" @click="copyCode(scope.row)" v-if="isAllowCopyData">
                   <i class="el-icon-document-copy" />&nbsp;复制数据</span
                 >
-                <span 
+                <span v-if="isAllowCheckData"
                   class="editsty"
                   @click="viewTarget(scope.row)"
                 >查看数据</span>
@@ -615,6 +625,18 @@ export default {
     linkUrl() {
       const LINK_CHART_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/chartshow';
       return `${LINK_CHART_URL}?code=${this.chartInfo.UniqueCode}&fromType=share?&lang=${this.currentLang}`
+    },
+    //是否允许编辑上下限
+    isAllowEditLimit(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_editLimit')
+    },
+    //是否允许复制数据
+    isAllowCopyData(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_copyData')
+    },
+    //是否允许查看数据
+    isAllowCheckData(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_checkData')
     }
   },
   watch: {

src/views/mychart_manage/index.vue

@@ -64,7 +64,7 @@
               </span>
              
               <div class="right-item right-item-box" >
-                <el-dropdown @command="handleCommand" trigger="click">
+                <el-dropdown @command="handleCommand" trigger="click" v-if="isShowDropPublic">
                   <span class="el-dropdown-link"> 
                     <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
                   </span>
@@ -106,7 +106,8 @@
                 {{ item.MyChartClassifyName }}
               </div>
               <div class="right-item right-item-box">
-                <el-dropdown style="margin-right: 10px" @command="handleCommand" trigger="click">
+                <el-dropdown v-if="isShowGroupBtn"
+                    style="margin-right: 10px" @command="handleCommand" trigger="click">
                   <span class="el-dropdown-link  el-dropdown-link-img">
                     <!-- <i class="el-icon-user" style="font-size: 16px; cursor: pointer"/> -->
                      <img src="~@/assets/img/chart_m/Group.png" v-if="item.IsPublic === 0">
@@ -131,20 +132,22 @@
                     所有人可见</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-                <el-dropdown @command="handleCommand" trigger="click">
+                <el-dropdown @command="handleCommand" trigger="click" v-if="isShowDropMine">
                   <span class="el-dropdown-link"> 
                     <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
                   </span>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{key:'edit'}">重命名</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'del'}">删除</el-dropdown-item>
+                    <el-dropdown-item v-if="permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_rename')"
+                        :command="{key:'edit'}">重命名</el-dropdown-item>
+                    <el-dropdown-item v-if="permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_delete')"
+                        :command="{key:'del'}">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
             </li>
           </draggable>
         </div>
-        <div class="noclassify" @click="addClassify">
+        <div class="noclassify" @click="addClassify" v-permission="permissionBtn.myETAPermission.myChart_classifyOpt_edit">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
@@ -379,6 +382,19 @@ export default {
       let id = Number(localStorage.getItem('AdminId'));
       return id;
     },
+    //是否显示公共图库的下拉按钮
+    isShowDropPublic(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_copy')
+    },
+    //是否显示我的图库的下拉按钮
+    isShowDropMine(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_rename')
+            || this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_delete')
+    },
+    //是否显示可见权限
+    isShowGroupBtn(){
+        return this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_show')
+    }
   },
   watch: {
     // 左侧选中分类

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -99,7 +99,7 @@
                 <span
                   style="display: flex; align-items: center"
                 >
-                <el-dropdown @command="handleShareCommand" v-if="data.PptVersion">
+                <el-dropdown @command="handleShareCommand" v-if="data.PptVersion&&permissionBtn.isShowBtn('pptPermission','ppt_visible')">
                   <img
                     :src="data.isShare===1?require('@/assets/img/chart_m/User.png'):require('@/assets/img/chart_m/Group.png')"
                     style="width: 14px; height: 14px; margin-right: 8px"
@@ -134,8 +134,8 @@
                         :command="{key:'edit',item:data}" v-if="data.GroupId">重命名</el-dropdown-item>
                     <el-dropdown-item v-permission="permissionBtn.pptPermission.ppt_del"
                         :command="{key:'del',item:data}">删除</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptVersion && !data.IsGrant">设置共享</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'cancelShare',item:data}" v-if="data.PptVersion && data.IsGrant">取消共享</el-dropdown-item>
+                    <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptVersion && !data.IsGrant && permissionBtn.isShowBtn('pptPermission','ppt_setShare')">设置共享</el-dropdown-item>
+                    <el-dropdown-item :command="{key:'cancelShare',item:data}" v-if="data.PptVersion && data.IsGrant && permissionBtn.isShowBtn('pptPermission','ppt_setShare')">取消共享</el-dropdown-item>
                     <el-dropdown-item v-permission="permissionBtn.pptPermission.ppt_toEn"
                         :command="{key:'transform',item:data}">转英文PPT</el-dropdown-item>
                   </el-dropdown-menu>
@@ -177,7 +177,7 @@
           </div>
         </div>
 
-        <div class="add-ppt" @click="handleCatalogChange({})">
+        <div class="add-ppt" @click="handleCatalogChange({})" v-if="permissionBtn.isShowBtn('pptPermission','ppt_addCatalog')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
@@ -1262,8 +1262,12 @@ export default {
                    checkPermissionBtn(pptPermission.ppt_del)||
                    checkPermissionBtn(pptPermission.ppt_toEn)
         }
-        //如果是PPT，会有设置共享按钮，下拉框至少会有一个选项
-        return true
+        if(type==='ppt'){
+            return  checkPermissionBtn(pptPermission.ppt_copy)||
+                    checkPermissionBtn(pptPermission.ppt_del)||
+                    checkPermissionBtn(pptPermission.ppt_setShare)||
+                    checkPermissionBtn(pptPermission.ppt_toEn)
+        }
     },
   },
   mounted(){

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -96,7 +96,7 @@
                 <span
                   style="display: flex; align-items: center"
                 >
-                <el-dropdown @command="handleShareCommand" v-if="data.PptId">
+                <el-dropdown @command="handleShareCommand" v-if="data.PptId&&permissionBtn.isShowBtn('enPPTPermission','pptEn_visible')">
                   <img
                     :src="data.isShare===1?require('@/assets/img/chart_m/User.png'):require('@/assets/img/chart_m/Group.png')"
                     style="width: 14px; height: 14px; margin-right: 8px"
@@ -131,8 +131,8 @@
                         :command="{key:'edit',item:data}" v-if="data.GroupId">重命名</el-dropdown-item>
                     <el-dropdown-item v-permission="permissionBtn.enPPTPermission.pptEn_del"
                         :command="{key:'del',item:data}">删除</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptId && !data.IsGrant">设置共享</el-dropdown-item>
-                    <el-dropdown-item :command="{key:'cancelShare',item:data}" v-if="data.PptId && data.IsGrant">取消共享</el-dropdown-item>
+                    <el-dropdown-item :command="{key:'openShare',item:data}" v-if="data.PptId && !data.IsGrant && permissionBtn.isShowBtn('enPPTPermission','pptEn_setShare')">设置共享</el-dropdown-item>
+                    <el-dropdown-item :command="{key:'cancelShare',item:data}" v-if="data.PptId && data.IsGrant && permissionBtn.isShowBtn('enPPTPermission','pptEn_setShare')">取消共享</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 </span>
@@ -172,7 +172,7 @@
           </div>
         </div>
 
-        <div class="add-ppt" @click="handleCatalogChange({})">
+        <div class="add-ppt" @click="handleCatalogChange({})" v-if="permissionBtn.isShowBtn('enPPTPermission','pptEn_addCatalog')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
@@ -1157,8 +1157,11 @@ export default {
                    checkPermissionBtn(enPPTPermission.pptEn_save)||
                    checkPermissionBtn(enPPTPermission.pptEn_del)
         }
-        //如果是PPT，会有设置共享按钮，下拉框至少会有一个选项
-        return true
+        if(type==='ppt'){
+            return checkPermissionBtn(enPPTPermission.pptEn_copy)||
+                   checkPermissionBtn(enPPTPermission.pptEn_del)||
+                   checkPermissionBtn(enPPTPermission.pptEn_setShare)
+        }
     }
   },
   mounted(){

src/views/predictEdb_manage/components/chartInfo.vue

@@ -64,6 +64,7 @@
                     size="mini"
                     type="number"
                     placeholder="上限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[0].MaxData"
                     @change="setChartOptionHandle(tableData)"
                 />
@@ -72,6 +73,7 @@
                     size="mini"
                     type="number"
                     placeholder="下限"
+                    :disabled="!isAllowEditLimit"
                     v-model="tableData[0].MinData"
                     @change="setChartOptionHandle(tableData)"
                 />
@@ -99,7 +101,8 @@ export default {
     mixins: [ chartSetMixin,addOrEditMixn ],
     props:{
         edbData:Object,
-        lang: String
+        lang: String,
+        isAllowEditLimit:Boolean,
     },
     watch:{
         'edbData':{

src/views/predictEdb_manage/components/edbDetail.vue

@@ -3,6 +3,7 @@
         <chartInfo
             :edbData="edbData"
             :lang="lang"
+            :isAllowEditLimit="isAllowEditLimit"
             @refreshData="refreshData"
             ref="chartInfo"
         />
@@ -50,7 +51,8 @@ import chartInfo from './chartInfo.vue'
 export default {
     props:{
         id: Number,
-        lang: String
+        lang: String,
+        isAllowEditLimit:Boolean,
     },
     components:{chartInfo},
     watch:{

src/views/predictEdb_manage/predictEdb.vue

@@ -42,7 +42,8 @@
 				</div>
         <div style="margin:20px 0;padding:0 20px;display:flex;justify-content:space-between">
 					<span>目录</span>
-					<el-checkbox v-model="isOnlyMe"  @change="onlyMeHandler">只看我的</el-checkbox>
+					<el-checkbox v-model="isOnlyMe" v-permission="permissionBtn.predictEdbPermission.edbPreData_isOnlyMine"
+						@change="onlyMeHandler">只看我的</el-checkbox>
 				</div>
 				<div class="tree-cont">
 					<el-tree
@@ -99,38 +100,44 @@
 									style="width: 14px; height: 14px; margin-right: 8px"
 									v-if="data.Button.MoveButton"
 								/>
+								<!-- 添加子项 -->
 								<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.Button.AddButton&&!data.EdbInfoId"
+									v-if="data.Button.AddButton&&!data.EdbInfoId&&isEdbBtnShow('edbPreData_classifyOpt_add')"
 								/>
+								<!-- 编辑目录 -->
 								<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.Button.OpButton&&!data.EdbInfoId"
+									v-if="data.Button.OpButton&&!data.EdbInfoId&&isEdbBtnShow('edbPreData_classifyOpt_add')"
 								/>
+								<!-- 删除目录 -->
 								<img
 									slot="reference"
 									src="~@/assets/img/set_m/del.png"
 									alt=""
 									style="width: 14px; height: 14px"
 									@click.stop="removeNode(node, data)"
-									v-if="data.Button.DeleteButton&&!data.EdbInfoId"
+									v-if="data.Button.DeleteButton&&!data.EdbInfoId&&isEdbBtnShow('edbPreData_classifyOpt_delete')"
 								/>
-								<i class="el-icon-view" v-if="data.EdbInfoId" @click.stop="viewNode(node,data)"></i>
+								<!-- 查看预测规则 -->
+								<i class="el-icon-view" v-if="data.EdbInfoId&&isEdbBtnShow('edbPreData_checkPreRule')" @click.stop="viewNode(node,data)"></i>
+								<!-- 查看关联图表 -->
 								<img 
-									v-if="data.Button.ShowChartRelation" 
+									v-if="data.Button.ShowChartRelation&&isEdbBtnShow('edbPreData_checkRelatedChart')" 
 									@click.stop="showAssociateChart=true,showAssociateComputeData=false"
 									src="~@/assets/img/icons/associate_chart.png" 
 									style="width: 14px; height: 14px;margin-left: 8px"
 									alt=""
 								/>
+								<!-- 查看关联指标 -->
 								<img 
-									v-if="data.Button.ShowEdbRelation" 
+									v-if="data.Button.ShowEdbRelation&&isEdbBtnShow('edbPreData_checkRelatedEdb')" 
 									@click.stop="showAssociateComputeData=true,showAssociateChart=false"
 									src="~@/assets/img/icons/associate_data.png" 
 									style="width: 14px; height: 14px;margin-left: 8px"
@@ -142,7 +149,7 @@
 					<div
 						class="noDepart"
 						@click="addLevelOneHandle"
-						v-if="opLevelOneClassify"
+						v-if="opLevelOneClassify&&isEdbBtnShow('edbPreData_classifyOpt_add')"
 					>
 						<img
 							src="~@/assets/img/set_m/add_ico.png"
@@ -184,13 +191,13 @@
 							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_update"
 								type="text" @click="updateEdbPartHandle">刷新</el-button>
 							<el-button type="text" @click="editEdbHandle('')" 
-								v-if="edbButton.OpButton&&permissionBtn.checkPermissionBtn(permissionBtn.predictEdbPermission.edbPreData_edit)">编辑</el-button>
+								v-if="edbButton.OpButton&&isEdbBtnShow('edbPreData_edit')">编辑</el-button>
 							<el-button type="text" @click="saveEdbHandle" 
-								v-if="detail_show_chart&&permissionBtn.checkPermissionBtn(permissionBtn.predictEdbPermission.edbPreData_save)">保存</el-button>
+								v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
 							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_recalcu"
 								type="text" @click="updateEdbHandle">重新计算</el-button>
 							<el-button class="deletesty" @click="delEdbHandle" type="text"
-								v-if="edbButton.DeleteButton&&permissionBtn.checkPermissionBtn(permissionBtn.predictEdbPermission.edbPreData_del)">删除</el-button>
+								v-if="edbButton.DeleteButton&&isEdbBtnShow('edbPreData_del')">删除</el-button>
 							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_copyData"
 								type="text" @click="copyData">复制数据</el-button>
 							<!-- <el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_viewData"
@@ -205,6 +212,7 @@
 							:is="detail_show_chart?'edbDetail':'childData'"
 							:id="select_id"
 							:lang="currentLang" 
+							:isAllowEditLimit="isEdbBtnShow('edbPreData_editLimit')"
 							ref="detailComponentRef"
 							
 							@updateTit="setNameBack"
@@ -692,6 +700,10 @@ export default {
 		}
 	},
 	methods: {
+		isEdbBtnShow(type){
+			const {predictEdbPermission,checkPermissionBtn}=this.permissionBtn
+			return checkPermissionBtn(predictEdbPermission[type])||false
+		},
 		setCurrentClassify(classifyId){
 			//获取指标详情后才能拿到准确的classifyId
 			//根据准备的id查找指标的父级目录并展开

src/views/semantics_manage/documentPage.vue

@@ -52,7 +52,7 @@
                 >
                   <img
                     :src="require('@/assets/img/set_m/edit.png')"
-                    alt="" v-if="node.level!==2"
+                    alt="" v-if="node.level!==2&&isShowTreeBtn(node.level,'edit')"
                     style="width: 14px; height: 14px; margin-right: 5px"
                     @click.stop="clickNodeHandle('edit', data)"
                   />
@@ -63,7 +63,7 @@
                   />
                   <img
                     :src="require('@/assets/img/set_m/del.png')"
-                    alt=""
+                    alt="" v-if="isShowTreeBtn(node.level,'delete')"
                     style="width: 14px; height: 14px; margin-right: 5px"
                     @click.stop="clickNodeHandle('del', data)"
                   />
@@ -73,7 +73,7 @@
         </div>
       </div>
       <div class="catalog-tool">
-        <div class="add-catalog" @click="isModifyClassifyShow=true">
+        <div class="add-catalog" @click="isModifyClassifyShow=true" v-if="isShowTreeBtn(1,'edit')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
@@ -392,6 +392,12 @@ export default {
             this.$message.success('移动成功')
         })
     },
+    //根据层级判断是否展示编辑/删除按钮
+    isShowTreeBtn(level,btnType){
+        return level===1
+            ?this.permissionBtn.isShowBtn('semanticPermission',`docPage_classifyOpt_${btnType}`)
+            :this.permissionBtn.isShowBtn('semanticPermission',`docPage_${btnType==='edit'?'save':btnType}`)
+    }
   },
 };
 </script>

src/views/semantics_manage/semanticsPage.vue

@@ -53,13 +53,13 @@
                 >
                   <img
                     :src="require('@/assets/img/set_m/edit.png')"
-                    alt="" v-if="node.level!==2"
+                    alt="" v-if="node.level!==2&&isShowTreeBtn(node.level,'edit')"
                     style="width: 14px; height: 14px; margin-right: 5px"
                     @click.stop="clickNodeHandle('edit', data)"
                   />
                   <img
                     :src="require('@/assets/img/set_m/del.png')"
-                    alt=""
+                    alt="" v-if="isShowTreeBtn(node.level,'delete')"
                     style="width: 14px; height: 14px; margin-right: 5px"
                     @click.stop="clickNodeHandle('del', data)"
                   />
@@ -69,7 +69,7 @@
         </div>
       </div>
       <div class="catalog-tool">
-        <div class="add-catalog" @click="isModifyClassifyShow=true">
+        <div class="add-catalog" @click="isModifyClassifyShow=true" v-if="isShowTreeBtn(1,'edit')">
           <img
             src="~@/assets/img/set_m/add_ico.png"
             alt=""
@@ -156,21 +156,27 @@
             </svg>
             <span>编辑</span>
           </div>
-          <div class="opt-item" @click="handleDownLoadImg">
+          <div class="opt-item" 
+            v-permission="permissionBtn.semanticPermission.saPage_download" 
+            @click="handleDownLoadImg">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
               <path d="M12.2636 5.81387L8.5 9.57746L8.49998 0.5L7.49998 0.500002L7.5 9.57746L3.73641 5.81387L3.02931 6.52098L7.64645 11.1381C7.84171 11.3334 8.15829 11.3334 8.35355 11.1381L12.9707 6.52098L12.2636 5.81387Z" fill="#409EFF"/>
               <path d="M2 11V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V11H13V13H3V11H2Z" fill="#409EFF"/>
             </svg>
             <span>下载</span>
           </div>
-          <div class="opt-item" @click="handleCopyImg">
+          <div class="opt-item" 
+            v-permission="permissionBtn.semanticPermission.saPage_copyOffice" 
+            @click="handleCopyImg">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
               <path d="M3.99995 1.92191C3.99995 1.33727 4.52001 1 4.9953 1H9.36584C9.63437 1 9.89162 1.108 10.0797 1.29969L13.7139 5.00415C13.8972 5.19093 13.9999 5.44209 14.0001 5.70375L14.0046 12.0777C14.0046 12.6624 13.4846 13 13.0093 13H4.99995C4.52472 13 4.00474 12.6628 4.00461 12.0783L3.99995 1.92191ZM4.99999 2L5.00457 12H13.0046L13.0003 6.01275H9.00004V2H4.99999ZM10 2.64645V5.01275H12.3215L10 2.64645Z" fill="#409EFF"/>
               <path d="M2 5.00001V14.0128C2 14.565 2.44772 15.0128 3 15.0128H11V14.0128L3 14.0128V5.00001H2Z" fill="#409EFF"/>
             </svg>
             <span>复制到Office</span>
           </div>
-          <div class="opt-item" @click="handleCopyImg">
+          <div class="opt-item" 
+            v-permission="permissionBtn.semanticPermission.saPage_copyWeixin"
+            @click="handleCopyImg">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
               <mask id="mask0_803_18530" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">
                 <rect width="16" height="16" fill="#D9D9D9"/>
@@ -418,6 +424,12 @@ export default {
                     level:2
                 })
         })
+    },
+    //根据层级判断是否展示编辑/删除按钮
+    isShowTreeBtn(level,btnType){
+        return level===1
+            ?this.permissionBtn.isShowBtn('semanticPermission',`saPage_classifyOpt_${btnType}`)
+            :this.permissionBtn.isShowBtn('semanticPermission',`saPage_${btnType==='edit'?'save':btnType}`)
     }
   },
 };

src/views/system_manage/dataAuthManage.vue

@@ -56,7 +56,7 @@
 		</div>
 		<div class="dataAuth-bot">
 			<div>
-				<span class="add-btn" @click="addClassifyHandle">
+				<span class="add-btn" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('operateAuthPermission','sysdataAuth_classify')">
 					<i
 						class="el-icon-circle-plus-outline"
 						style="color: #5882ef; font-size: 16px"

src/views/system_manage/departManage.vue

@@ -23,10 +23,11 @@
 					<span style="display:flex;alignItems:center;" v-show="act_node===data.unicodeKey">
                         <img src="~@/assets/img/data_m/move_ico.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop>
 						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" 
-						v-if="data.IsDepartment && (!isTrail || (isTrail && data.canEdit))">
-						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" v-if="data.IsGroup">
+						v-if="data.IsDepartment && (!isTrail || (isTrail && data.canEdit))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
+						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" 
+						v-if="data.IsGroup&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<img src="~@/assets/img/set_m/edit.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="editNode(data)"
-						v-if="(!isTrail) || (data.canEdit||data.IsGroup)">
+						v-if="((!isTrail) || (data.canEdit||data.IsGroup))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<el-popconfirm
 						@onConfirm="removeNode(node,data)"
 						confirmButtonText='删除'
@@ -35,7 +36,7 @@
 						icon="el-icon-info"
 						iconColor="red"
 						title="确定删除吗"
-						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))"
+						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_delete')"
 						>
 						<!-- 共享客户组不允许删除 -->
 							<img slot="reference" src="~@/assets/img/set_m/del.png" alt="" style="width:12px;height:12px;marginTop:4px">
@@ -43,7 +44,7 @@
 					</span>
 				</span>
 			</el-tree>
-			<div class="noDepart" @click="addDepart">
+			<div class="noDepart" @click="addDepart" v-if="permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 				<img src="~@/assets/img/set_m/add_ico.png" alt="" style="width:16px;height:16px;marginRight:10px;">
 				<span>新建部门</span>
 			</div>