接口联调

src/api/modules/setApi.js

@@ -248,7 +248,14 @@ const departInterence = {
 	//获取角色的权限信息，包括菜单和功能 (crm14.1)
 	//RoleId
 	getRoleAuth:params=>{
-		return http.get('/system/role/menu/list',params)
+		return http.get('/system/role/menu/auth_list',params)
+	},
+	//保存角色菜单权限 (crm14.1)
+	//RoleId
+	//MenuIds
+	//HalfMenuIds
+	saveRoleAuth:params=>{
+		return http.post('/system/role/menu/auth_save',params)
 	},
 	//获取用户所有的按钮权限
 	getRoleBtnAuth:params=>{

src/main.js

@@ -166,7 +166,7 @@ router.beforeEach(async(to, from, next) => {
       window._hmt.push(["_trackPageview", "/#" + to.fullPath]);
     }
     //获取权限按钮
-    await store.dispatch('getPermissionButtons')
+    to.path != "/login"&&to.path!='/temppage'&&await store.dispatch('getPermissionButtons')
     next();
   } else {
     next({ path: "/404" });

src/utils/buttonConfig.js

@@ -7,7 +7,7 @@ import {store} from "../main";
  * @returns Boolean
  */
 export const checkPermissionBtn = (button_code)=>{
-    const buttonCodes = store.state.permissionButton.permissionButtons.map(item=>item.button_code)
+    const buttonCodes = store.state.permissionButton.permissionButtons.map(item=>item.ButtonCode)
     return buttonCodes.includes(button_code)
 }
 /*

src/utils/buttonPermission.js

@@ -3,7 +3,7 @@ import Vue from 'vue';
 import {store} from "../main";
 Vue.directive('permission',{
     inserted(el,binding){
-        const buttonCodes = store.state.permissionButton.permissionButtons.map(item=>item.button_code)
+        const buttonCodes = store.state.permissionButton.permissionButtons.map(item=>item.ButtonCode)
         const {value} = binding
         if(value && typeof(value)=='string'){
             // 字符类型

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -565,7 +565,7 @@ export default {
             authArr.push(k)
           }
       }
-      this.pptToolList = toolList.filter((i)=>{
+      this.pptToolList = this.pptToolList.filter((i)=>{
           return authArr.includes(i.key)
         })
     },

src/views/system_manage/mock.js

@@ -1,1363 +0,0 @@
-export const mockList = [
-    {
-      "MenuId": 1,
-      "ParentId": 0,
-      "Name": "研报管理",
-      "RootId": 0,
-      "Sort": "1",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/yb_manager.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 2,
-          "ParentId": 1,
-          "Name": "研报列表",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "reportlist",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": [
-            {
-              "MenuId": 200,
-              "ParentId": 2,
-              "Name": "推送消息/已推送消息",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/sendMsg",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:sendMsg",
-              "Children": []
-            },
-            {
-              "MenuId": 199,
-              "ParentId": 2,
-              "Name": "预览",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/reportView",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:reportView",
-              "Children": [
-                {
-                  "MenuId": 204,
-                  "ParentId": 199,
-                  "Name": "微信分享",
-                  "RootId": 0,
-                  "Sort": "1",
-                  "Path": "reportManage/reportView/wechartShare",
-                  "PathName": "",
-                  "IconPath": "",
-                  "Component": 0,
-                  "Hidden": 0,
-                  "HiddenLayout": 0,
-                  "Level": 0,
-                  "MenuType": 2,
-                  "ButtonCode": "reportManage:reportView:wechartShare",
-                  "Children": []
-                },
-                {
-                  "MenuId": 203,
-                  "ParentId": 199,
-                  "Name": "复制微信",
-                  "RootId": 0,
-                  "Sort": "1",
-                  "Path": "reportManage/reportView/copyWechat",
-                  "PathName": "",
-                  "IconPath": "",
-                  "Component": 0,
-                  "Hidden": 0,
-                  "HiddenLayout": 0,
-                  "Level": 0,
-                  "MenuType": 2,
-                  "ButtonCode": "reportManage:reportView:copyWechat",
-                  "Children": []
-                }
-              ]
-            },
-            {
-              "MenuId": 198,
-              "ParentId": 2,
-              "Name": "音频下载",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/audioDownload",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:audioDownload",
-              "Children": []
-            },
-            {
-              "MenuId": 197,
-              "ParentId": 2,
-              "Name": "音频上传",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/audioUpload",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:audioUpload",
-              "Children": []
-            },
-            {
-              "MenuId": 196,
-              "ParentId": 2,
-              "Name": "删除",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/reportDel",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:reportDel",
-              "Children": []
-            },
-            {
-              "MenuId": 195,
-              "ParentId": 2,
-              "Name": "编辑",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/reportEdit",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:reportEdit",
-              "Children": []
-            },
-            {
-              "MenuId": 194,
-              "ParentId": 2,
-              "Name": "取消发布",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/cancelPublish",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:cancelPublish",
-              "Children": []
-            },
-            {
-              "MenuId": 193,
-              "ParentId": 2,
-              "Name": "发布",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/publish",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:publish",
-              "Children": []
-            },
-            {
-              "MenuId": 192,
-              "ParentId": 2,
-              "Name": "列表",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/reportList",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:reportList",
-              "Children": [
-                {
-                  "MenuId": 202,
-                  "ParentId": 192,
-                  "Name": "UV",
-                  "RootId": 0,
-                  "Sort": "1",
-                  "Path": "reportManage/reportList/uv",
-                  "PathName": "",
-                  "IconPath": "",
-                  "Component": 0,
-                  "Hidden": 0,
-                  "HiddenLayout": 0,
-                  "Level": 0,
-                  "MenuType": 2,
-                  "ButtonCode": "reportManage:reportList:uv",
-                  "Children": []
-                },
-                {
-                  "MenuId": 201,
-                  "ParentId": 192,
-                  "Name": "报告推送时间",
-                  "RootId": 0,
-                  "Sort": "1",
-                  "Path": "reportManage/reportList/sendTime",
-                  "PathName": "",
-                  "IconPath": "",
-                  "Component": 0,
-                  "Hidden": 0,
-                  "HiddenLayout": 0,
-                  "Level": 0,
-                  "MenuType": 2,
-                  "ButtonCode": "reportManage:reportList:sendTime",
-                  "Children": []
-                }
-              ]
-            },
-            {
-              "MenuId": 191,
-              "ParentId": 2,
-              "Name": "添加晨报/周报",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/dayWeekReportAdd",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:dayWeekReportAdd",
-              "Children": []
-            },
-            {
-              "MenuId": 190,
-              "ParentId": 2,
-              "Name": "添加研报",
-              "RootId": 0,
-              "Sort": "1",
-              "Path": "reportManage/reportAdd",
-              "PathName": "",
-              "IconPath": "",
-              "Component": 0,
-              "Hidden": 0,
-              "HiddenLayout": 0,
-              "Level": 0,
-              "MenuType": 1,
-              "ButtonCode": "reportManage:reportAdd",
-              "Children": []
-            }
-          ]
-        },
-        {
-          "MenuId": 133,
-          "ParentId": 1,
-          "Name": "英文研报",
-          "RootId": 0,
-          "Sort": "2",
-          "Path": "reportEnList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 3,
-          "ParentId": 1,
-          "Name": "分类列表",
-          "RootId": 0,
-          "Sort": "3",
-          "Path": "classifylist",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 137,
-          "ParentId": 1,
-          "Name": "作者管理",
-          "RootId": 0,
-          "Sort": "4",
-          "Path": "reportAuthor",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 187,
-          "ParentId": 1,
-          "Name": "英文品种配置",
-          "RootId": 0,
-          "Sort": "5",
-          "Path": "reportvariety",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 155,
-          "ParentId": 1,
-          "Name": "云盘",
-          "RootId": 0,
-          "Sort": "6",
-          "Path": "cloudDisk",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 4,
-      "ParentId": 0,
-      "Name": "智能ppt",
-      "RootId": 0,
-      "Sort": "2",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/ppt.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 5,
-          "ParentId": 4,
-          "Name": "ppt列表",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "pptlist",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 134,
-      "ParentId": 0,
-      "Name": "英文ppt",
-      "RootId": 0,
-      "Sort": "3",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/english_ppt.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 135,
-          "ParentId": 134,
-          "Name": "英文ppt",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "pptenlist",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 6,
-      "ParentId": 0,
-      "Name": "数据源",
-      "RootId": 0,
-      "Sort": "4",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/data_source.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 8,
-          "ParentId": 6,
-          "Name": "手工指标列表",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "targetList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 7,
-          "ParentId": 6,
-          "Name": "手工数据录入",
-          "RootId": 0,
-          "Sort": "2",
-          "Path": "dataList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 151,
-          "ParentId": 6,
-          "Name": "期货数据库",
-          "RootId": 0,
-          "Sort": "3",
-          "Path": "futuresbase",
-          "PathName": "",
-          "IconPath": "https://hzchart.oss-cn-shanghai.aliyuncs.com/static/icon/admin_menu/new_icon/futuresbase.png",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 52,
-          "ParentId": 6,
-          "Name": "隆众原始数据库",
-          "RootId": 0,
-          "Sort": "4",
-          "Path": "lzTarget",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 53,
-          "ParentId": 6,
-          "Name": "钢联原始数据库",
-          "RootId": 0,
-          "Sort": "5",
-          "Path": "glTarget",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 129,
-          "ParentId": 6,
-          "Name": "钢联化工数据库",
-          "RootId": 0,
-          "Sort": "6",
-          "Path": "steelChemical",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 54,
-          "ParentId": 6,
-          "Name": "SMM原始数据库",
-          "RootId": 0,
-          "Sort": "7",
-          "Path": "smmTarget",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 160,
-          "ParentId": 6,
-          "Name": "百川盈孚",
-          "RootId": 0,
-          "Sort": "8",
-          "Path": "BAIINFOdata",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 150,
-          "ParentId": 6,
-          "Name": "卓创数据（红桃3）",
-          "RootId": 0,
-          "Sort": "9",
-          "Path": "SCIdata",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 82,
-          "ParentId": 6,
-          "Name": "中国煤炭市场网",
-          "RootId": 0,
-          "Sort": "10",
-          "Path": "chineseCoal",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 64,
-          "ParentId": 6,
-          "Name": "郑商所",
-          "RootId": 0,
-          "Sort": "11",
-          "Path": "zhengzhoushop",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 65,
-          "ParentId": 6,
-          "Name": "大商所",
-          "RootId": 0,
-          "Sort": "12",
-          "Path": "dalianshop",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 66,
-          "ParentId": 6,
-          "Name": "上期所",
-          "RootId": 0,
-          "Sort": "13",
-          "Path": "shanghaifutures",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 67,
-          "ParentId": 6,
-          "Name": "中金所",
-          "RootId": 0,
-          "Sort": "14",
-          "Path": "chinafutures",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 68,
-          "ParentId": 6,
-          "Name": "上期能源",
-          "RootId": 0,
-          "Sort": "15",
-          "Path": "shanghaienergy",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 121,
-          "ParentId": 6,
-          "Name": "谷歌出行指数",
-          "RootId": 0,
-          "Sort": "16",
-          "Path": "googleTravel",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 138,
-          "ParentId": 6,
-          "Name": "EIA  STEO报告",
-          "RootId": 0,
-          "Sort": "17",
-          "Path": "steobase",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 74,
-          "ParentId": 6,
-          "Name": "天然气",
-          "RootId": 0,
-          "Sort": "18",
-          "Path": "gasTarget",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 147,
-          "ParentId": 6,
-          "Name": "UN",
-          "RootId": 0,
-          "Sort": "19",
-          "Path": "UNdata",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 177,
-          "ParentId": 6,
-          "Name": "国家统计局",
-          "RootId": 0,
-          "Sort": "20",
-          "Path": "NationalData",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 46,
-      "ParentId": 0,
-      "Name": "ETA指标库",
-      "RootId": 0,
-      "Sort": "5",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/eta_data.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 35,
-          "ParentId": 46,
-          "Name": "数据指标库",
-          "RootId": 0,
-          "Sort": "3",
-          "Path": "database",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 125,
-      "ParentId": 0,
-      "Name": "ETA预测指标",
-      "RootId": 0,
-      "Sort": "6",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/eta_predict_data.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 126,
-          "ParentId": 125,
-          "Name": "ETA预测指标",
-          "RootId": 0,
-          "Sort": "0",
-          "Path": "predictEdb",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 47,
-      "ParentId": 0,
-      "Name": "ETA图库",
-      "RootId": 0,
-      "Sort": "7",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/eta_chart.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 44,
-          "ParentId": 47,
-          "Name": "研究图库",
-          "RootId": 0,
-          "Sort": "4",
-          "Path": "chartsetting",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 61,
-      "ParentId": 0,
-      "Name": "My ETA",
-      "RootId": 0,
-      "Sort": "8",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/my_eta.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 62,
-          "ParentId": 61,
-          "Name": "My ETA",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "mychart",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 123,
-      "ParentId": 0,
-      "Name": "ETA表格",
-      "RootId": 0,
-      "Sort": "9",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/eta_table.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 124,
-          "ParentId": 123,
-          "Name": "ETA表格",
-          "RootId": 0,
-          "Sort": "0",
-          "Path": "sheetList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 75,
-      "ParentId": 0,
-      "Name": "ETA逻辑",
-      "RootId": 0,
-      "Sort": "10",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/eta_logic.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 76,
-          "ParentId": 75,
-          "Name": "沙盘列表",
-          "RootId": 0,
-          "Sort": "0",
-          "Path": "sandlist",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 165,
-      "ParentId": 0,
-      "Name": "语义分析",
-      "RootId": 0,
-      "Sort": "11",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/semantic_analysis.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 167,
-          "ParentId": 165,
-          "Name": "文档管理",
-          "RootId": 0,
-          "Sort": "2",
-          "Path": "documentPage",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 168,
-          "ParentId": 165,
-          "Name": "文档对比",
-          "RootId": 0,
-          "Sort": "3",
-          "Path": "semanticsPage",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 166,
-          "ParentId": 165,
-          "Name": "标签管理",
-          "RootId": 0,
-          "Sort": "4",
-          "Path": "tagPage",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 158,
-      "ParentId": 0,
-      "Name": "统计分析",
-      "RootId": 0,
-      "Sort": "12",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/statistic_analysis.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 159,
-          "ParentId": 158,
-          "Name": "相关性分析",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "chartrelevance",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 182,
-          "ParentId": 158,
-          "Name": "拟合方程曲线",
-          "RootId": 0,
-          "Sort": "2",
-          "Path": "fittingEquationList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 184,
-          "ParentId": 158,
-          "Name": "统计特征",
-          "RootId": 0,
-          "Sort": "3",
-          "Path": "statisticFeatureList",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 169,
-      "ParentId": 0,
-      "Name": "供应分析",
-      "RootId": 0,
-      "Sort": "13",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/supply_analysis.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 170,
-          "ParentId": 169,
-          "Name": "装置检修",
-          "RootId": 0,
-          "Sort": "0",
-          "Path": "stockplant",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 171,
-          "ParentId": 169,
-          "Name": "分析品种",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "analyseVariety",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 1,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 153,
-      "ParentId": 0,
-      "Name": "商品价格曲线",
-      "RootId": 0,
-      "Sort": "14",
-      "Path": "",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/product_price.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 154,
-          "ParentId": 153,
-          "Name": "商品价格曲线",
-          "RootId": 0,
-          "Sort": "0",
-          "Path": "commordityChartBase",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    },
-    {
-      "MenuId": 9,
-      "ParentId": 0,
-      "Name": "系统设置",
-      "RootId": 0,
-      "Sort": "107",
-      "Path": "/",
-      "PathName": "",
-      "IconPath": "https://hzstatic.hzinsights.com/static/eta/admin/icon/system_manager.png",
-      "Component": 0,
-      "Hidden": 0,
-      "HiddenLayout": 0,
-      "Level": 0,
-      "MenuType": 0,
-      "ButtonCode": "",
-      "Children": [
-        {
-          "MenuId": 10,
-          "ParentId": 9,
-          "Name": "部门管理",
-          "RootId": 0,
-          "Sort": "1",
-          "Path": "Sysdepart",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 11,
-          "ParentId": 9,
-          "Name": "角色管理",
-          "RootId": 0,
-          "Sort": "2",
-          "Path": "Sysrole",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 48,
-          "ParentId": 9,
-          "Name": "手工数据权限",
-          "RootId": 0,
-          "Sort": "6",
-          "Path": "Sysdatauth",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 141,
-          "ParentId": 9,
-          "Name": "数据操作权限",
-          "RootId": 0,
-          "Sort": "7",
-          "Path": "operateAuth",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 145,
-          "ParentId": 9,
-          "Name": "英文权限配置",
-          "RootId": 0,
-          "Sort": "10",
-          "Path": "enAuthManage",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        },
-        {
-          "MenuId": 189,
-          "ParentId": 9,
-          "Name": "基本配置",
-          "RootId": 0,
-          "Sort": "12",
-          "Path": "etaBaseConfig",
-          "PathName": "",
-          "IconPath": "",
-          "Component": 0,
-          "Hidden": 0,
-          "HiddenLayout": 0,
-          "Level": 0,
-          "MenuType": 0,
-          "ButtonCode": "",
-          "Children": []
-        }
-      ]
-    }
-  ]

src/views/system_manage/newAuthManage.vue

@@ -27,7 +27,6 @@
 
 <script>
 import {departInterence} from '@/api/api.js';
-import {mockList} from './mock';
 export default {
     name: '',
     components: {},
@@ -68,9 +67,7 @@ export default {
         },
         /* 根据角色id获取已有权限 */
         getAuthList() {
-            this.authList = mockList
-            this.loading&&this.loading.close()
-            /* departInterence.getRoleAuth({
+            departInterence.getRoleAuth({
                 RoleId: Number(this.role)
             }).then(res => {
                 if (res.Ret !== 200) return
@@ -84,10 +81,26 @@ export default {
                 this.authList = List || []
                 this.defaultCheckedKeys = ChoiceList.filter((item) => !HalfChoiceList.some((halfItem) =>
                     item === halfItem))
-            }) */
+            })
         },
         // 保存
-        saveAuth() {}
+        saveAuth() {
+            const keys = this.$refs.checkboxTree.getCheckedKeys()
+            const halfKeys = this.$refs.checkboxTree.getHalfCheckedKeys()
+            if(!keys.length&&!halfKeys.length){
+                this.$message.warning('请至少选择一个权限')
+                return
+            }
+            const ChoiceList = Array.from(new Set([...keys,...halfKeys]))
+            departInterence.saveRoleAuth({
+                RoleId:Number(this.role),
+                MenuIds:ChoiceList,
+                HalfMenuIds:halfKeys
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success('权限设置成功')
+            })
+        }
     },
     created() {
         //只查看权限 不可编辑
@@ -206,6 +219,7 @@ export default {
 
                 .el-tree-node {
                     display: flex;
+                    flex:1;
                     padding: 0px !important;
 
                     .el-tree-node__content {

src/vuex/modules/permissionButton.js

@@ -1,3 +1,4 @@
+import {departInterence} from '@/api/api.js';
 // 权限配置按钮
 const permissionButtons = {
     state:()=>({
@@ -11,46 +12,46 @@ const permissionButtons = {
     actions:{
         getPermissionButtons({commit}){
             return new Promise((resolve,reject)=>{
-                /* getPermissionButtons().then(res=>{
-                  commit('GET_PERMISSION_BUTTONS',res.data.list || [])
-                  // console.log(res);
-                  resolve('获取权限按钮成功')
-                }) */
-                const buttons = [
-                    {button_code: "system:menu:add"},
-                    {button_code: "system:user:add"},
-                    {button_code:'reportManage:reportList:sendTime'},
-                    {button_code:'reportManage:reportView'},
-                    {button_code:'reportManage_reportView_copyWechat'},
-                    {button_code:'enReport:reportView'},
-                    {button_code:'enReport:reportView:wechatShare'},
-                    //{button_code:'classifyList:enClassify'},
-                    {button_code:'classifyList:cnClassify'},
-                    {button_code:'classifyList:cnClassify:classifyAdd'},
-                    {button_code:'authorManage:add'},
-                    {button_code:'authorManage:cnReport'},
-                    {button_code:'authorManage:enReport'},
-                    {button_code:'authorManage:cnReport:edit'},
+                departInterence.getRoleBtnAuth().then(res=>{
+                    const buttons = res.Data || []
+                    commit('SET_PERMISSION_BUTTONS',buttons)
+                    resolve('获取权限按钮成功')
+                })
+                /* const buttons = [
+                    {ButtonCode: "system:menu:add"},
+                    {ButtonCode: "system:user:add"},
+                    {ButtonCode:'reportManage:reportList:sendTime'},
+                    {ButtonCode:'reportManage:reportView'},
+                    {ButtonCode:'reportManage_reportView_copyWechat'},
+                    {ButtonCode:'enReport:reportView'},
+                    {ButtonCode:'enReport:reportView:wechatShare'},
+                    //{ButtonCode:'classifyList:enClassify'},
+                    {ButtonCode:'classifyList:cnClassify'},
+                    {ButtonCode:'classifyList:cnClassify:classifyAdd'},
+                    {ButtonCode:'authorManage:add'},
+                    {ButtonCode:'authorManage:cnReport'},
+                    {ButtonCode:'authorManage:enReport'},
+                    {ButtonCode:'authorManage:cnReport:edit'},
                     //ppt test
-                    {button_code:'ppt:show'},
-                    {button_code:'pptEn:show'},
+                    {ButtonCode:'ppt:show'},
+                    {ButtonCode:'pptEn:show'},
                     //table test
-                    {button_code:'etaTable:excel:download'},
+                    {ButtonCode:'etaTable:excel:download'},
                     //sandbox test
-                    {button_code:'sandbox:saveView'},
+                    {ButtonCode:'sandbox:saveView'},
                     //chartHandle test
-                    {button_code:'statisticFeature:share'},
+                    {ButtonCode:'statisticFeature:share'},
                     //stockPlant:anlysisView
-                    {button_code:'stockPlant:anlysisView'},
+                    {ButtonCode:'stockPlant:anlysisView'},
                     //goodsPrice:incomeLine:refresh
-                    {button_code:'goodsPrice:incomeLine:refresh'},
+                    {ButtonCode:'goodsPrice:incomeLine:refresh'},
                     //operaAuth test
-                    {button_code:'operateAuth:etaLib'},
-                    {button_code:'operateAuth:etaLib:authSetting'},
-                    {button_code:'operateAuth:mysteel'},
+                    {ButtonCode:'operateAuth:etaLib'},
+                    {ButtonCode:'operateAuth:etaLib:authSetting'},
+                    {ButtonCode:'operateAuth:mysteel'},
                 ]
                 commit('SET_PERMISSION_BUTTONS',buttons)
-                resolve('获取权限按钮成功')
+                resolve('获取权限按钮成功') */
             })
         }
     },