diff --git a/src/App.vue b/src/App.vue index 543e6f3..0029a6d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,13 +41,6 @@ export default { cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下 unzip ggfw-dangan.zip 解压 - - - - - - - */ }, }; diff --git a/src/store/modules/myselfPermission.js b/src/store/modules/myselfPermission.js index 2647745..2d71adb 100644 --- a/src/store/modules/myselfPermission.js +++ b/src/store/modules/myselfPermission.js @@ -12,7 +12,7 @@ const selfPermission = { userData: {}, inspectorId: "", usersort: '', - routershow:true + routershow: true }, mutations: { //动态按钮权限 @@ -71,7 +71,7 @@ const selfPermission = { //存储用户信息 commit("SET_USERDATA", infoData.userDto); - + let ismyobj = { "稽查一处": "沈阳市", "稽查二处": "大连市", @@ -99,17 +99,18 @@ const selfPermission = { // ); // commit("SET_PERMISSIONLIST", menuButton); //过滤菜单 - if(infoData.userDto.userCode == "admin"){ - let fileTreeOut = staticRouter.filter(item=>item.meta.title !='详情') + if (infoData.userDto.userCode == "admin") { + let fileTreeOut = staticRouter.filter(item => item.meta.title != '详情') fileTreeOut[0].children[0].meta.affix = true commit("SET_ROUTER", fileTreeOut); resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []); - return + return } let menuTree = infoData.menuTree.filter( (item) => item.appCode == "CPGL" ); let fileTreeOut = filterTree(menuTree[0].childMenuList, []); + console.log(777, fileTreeOut); // let fileTreeOut = []; // menuTree[0].childMenuList.forEach((item) => { @@ -131,19 +132,34 @@ const selfPermission = { }, }, }; - function filterTree(tree, result) { - + console.log("duibi111", tree); + console.log("duibi222", staticRouter); tree.forEach((item) => { - staticRouter.forEach((router, index) => { - if (item.menuUrl == router.path) { - result.push(router); - } - // if (item.childMenuList != null) { - // filterTree(tree[index].childMenuList, result[index].children); + staticRouter.forEach((routere, index) => { + // if (item.menuUrl == "/cosmeticsDetail") { + // result.push(routere); // } + if (item.menuUrl == routere.path) { + + if (item.childMenuList != null) { + result.push(routere); + let list = [] + // filterTree(tree[index].childMenuList, result[index].children); + item.childMenuList.forEach(itemTow => { + let obj = routere.children.filter(res => res.path == itemTow.menuUrl) + console.log(88,obj); + list.push(obj[0]) + }) + routere.children = list + } else { + + } + } + }); }); + console.log("成了", result); return result; } diff --git a/src/views/index.vue b/src/views/index.vue index 0bf66cf..e6b3ade 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -19,10 +19,10 @@ --> - +
-