commit

src/utils/buttonConfig.js

@@ -335,10 +335,6 @@ export const myETAPermission = {
 */
 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',
@@ -346,37 +342,45 @@ export const etaTablePermission = {
     etaTable_customize_otherSave:'etaTable:customize:otherSave',
     etaTable_customize_refresh:'etaTable:customize:refresh',
     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_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_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_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',//删除
-    /*-----------常规表格--------- */
+
+    /*-----------excel表格页面--------- */
+    etaTable_excel:'etaTable:excel',//添加Excel表格这个按钮显示不显示
+    etaTable_classifyOpt_edit:'etaTable:classifyOpt:edit',//添加编辑表格
+    etaTable_classifyOpt_delete:'etaTable:classifyOpt:delete',//删除表格
     etaTable_excel_del:'etaTable:excel:del',
     etaTable_excel_download:'etaTable:excel:download',
     etaTable_excel_save:'etaTable:excel:save',
 
-    /* 时间序列表格 */
-    etaTable_timeorder_del:'etaTable:timeorder:del',
-    etaTable_timeorder_download:'etaTable:timeorder:download',
-    etaTable_timeorder_otherSave:'etaTable:timeorder:otherSave',
-    etaTable_timeorder_refresh:'etaTable:timeorder:refresh',
-    etaTable_timeorder_edit:'etaTable:timeorder:edit',
-
-    /* 混合表格 */
-    etaTable_mixed_del:'etaTable:mixed:del',
-    etaTable_mixed_download:'etaTable:mixed:download',
-    etaTable_mixed_otherSave:'etaTable:mixed:otherSave',
-    etaTable_mixed_refresh:'etaTable:mixed:refresh',
-    etaTable_mixed_edit:'etaTable:mixed:edit',
+    //自定义分析表格页面
+    etaTable_analysisSheet_add: 'etaTable:analysisSheet:add',//添加数据表格按钮
+    etaTable_classifyOpt_analysis_edit: 'etaTable:classifyOpt:analysis:edit',//数据表格分类操作
+    etaTable_classifyOpt_analysis_delete: 'etaTable:classifyOpt:analysis: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',//删除
 }
 /*
  * --------------------------------------------------------------------------ETA逻辑------------------------------------------------