diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index 02e5f26..8efe509 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -65,7 +65,7 @@ console.log(item, 'itemitem'); activeIndex.value = item.name; localStorage.setItem('routerPartXG', item.name); - localStorage.setItem('fromDoorXG', 'door'); + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); bus.emit('selfMenuXG', item); } @@ -121,14 +121,13 @@ title: item.meta.title, name: item.name, }); - console.log(menuList.value, ' menuList1.value'); }); - menuList.value = menuList.value.filter(item => item.name != 'System'); //不显示系统管理 menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图 menuList1.value = menuList.value; activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中 - getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 + console.log(activeIndex.value, 'activeIndex.value'); + // getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 bus.on('closeUserCenter', e => { dialogShow.value = false; }); diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index 02e5f26..8efe509 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -65,7 +65,7 @@ console.log(item, 'itemitem'); activeIndex.value = item.name; localStorage.setItem('routerPartXG', item.name); - localStorage.setItem('fromDoorXG', 'door'); + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); bus.emit('selfMenuXG', item); } @@ -121,14 +121,13 @@ title: item.meta.title, name: item.name, }); - console.log(menuList.value, ' menuList1.value'); }); - menuList.value = menuList.value.filter(item => item.name != 'System'); //不显示系统管理 menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图 menuList1.value = menuList.value; activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中 - getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 + console.log(activeIndex.value, 'activeIndex.value'); + // getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 bus.on('closeUserCenter', e => { dialogShow.value = false; }); diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 4943ab1..7751c3e 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -69,7 +69,8 @@ } }); // 默认打开子系统的第一个页面 - if (localStorage.getItem('fromDoorXG') == 'door') { + if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { + console.log(newArr, 'newArr'); if (newArr.length == 0) { proxy.$modal.msgError('暂无权限查看该系统'); return; @@ -94,8 +95,8 @@ } else { paths = route.path; //当前的路由 } - // console.log(localStorage.getItem('fromDoorXG'), paths, newArr); - // console.log('路由跳转位置--', paths); + console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222'); + console.log('路由跳转位置--', paths); router.push(paths); //重定向打开路由 sidebarRouters.value = newArr; //添加子菜单 // 海绵综合一张图,不显示左侧菜单列表 diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index 02e5f26..8efe509 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -65,7 +65,7 @@ console.log(item, 'itemitem'); activeIndex.value = item.name; localStorage.setItem('routerPartXG', item.name); - localStorage.setItem('fromDoorXG', 'door'); + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); bus.emit('selfMenuXG', item); } @@ -121,14 +121,13 @@ title: item.meta.title, name: item.name, }); - console.log(menuList.value, ' menuList1.value'); }); - menuList.value = menuList.value.filter(item => item.name != 'System'); //不显示系统管理 menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图 menuList1.value = menuList.value; activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中 - getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 + console.log(activeIndex.value, 'activeIndex.value'); + // getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 bus.on('closeUserCenter', e => { dialogShow.value = false; }); diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 4943ab1..7751c3e 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -69,7 +69,8 @@ } }); // 默认打开子系统的第一个页面 - if (localStorage.getItem('fromDoorXG') == 'door') { + if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { + console.log(newArr, 'newArr'); if (newArr.length == 0) { proxy.$modal.msgError('暂无权限查看该系统'); return; @@ -94,8 +95,8 @@ } else { paths = route.path; //当前的路由 } - // console.log(localStorage.getItem('fromDoorXG'), paths, newArr); - // console.log('路由跳转位置--', paths); + console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222'); + console.log('路由跳转位置--', paths); router.push(paths); //重定向打开路由 sidebarRouters.value = newArr; //添加子菜单 // 海绵综合一张图,不显示左侧菜单列表 diff --git a/src/permission.js b/src/permission.js index cced843..2d58b89 100644 --- a/src/permission.js +++ b/src/permission.js @@ -12,13 +12,13 @@ NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/auth-redirect', '/bind', '/door', '/autoLogin']; +const whiteList = ['/login', '/auth-redirect', '/bind', '/door', '/autoLogin', '/chengguanweiScreen']; router.beforeEach((to, from, next) => { - console.log(from.path); + // console.log(from.path, '111'); // 跳转各个子系统时只显示各自对应的菜单内容设置 - if (from.path == '/door' || from.path == '/autoLogin') { - localStorage.setItem('fromDoorXG', 'door'); + if (from.path == '/chengguanweiScreen' || from.path == '/autoLogin') { + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); } else { localStorage.setItem('fromDoorXG', 'other'); } diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index 02e5f26..8efe509 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -65,7 +65,7 @@ console.log(item, 'itemitem'); activeIndex.value = item.name; localStorage.setItem('routerPartXG', item.name); - localStorage.setItem('fromDoorXG', 'door'); + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); bus.emit('selfMenuXG', item); } @@ -121,14 +121,13 @@ title: item.meta.title, name: item.name, }); - console.log(menuList.value, ' menuList1.value'); }); - menuList.value = menuList.value.filter(item => item.name != 'System'); //不显示系统管理 menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图 menuList1.value = menuList.value; activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中 - getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 + console.log(activeIndex.value, 'activeIndex.value'); + // getSelfMenu({ name: 'FloodSys', title: '排水管理子系统' }); //默认选中第一个菜单 bus.on('closeUserCenter', e => { dialogShow.value = false; }); diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 4943ab1..7751c3e 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -69,7 +69,8 @@ } }); // 默认打开子系统的第一个页面 - if (localStorage.getItem('fromDoorXG') == 'door') { + if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { + console.log(newArr, 'newArr'); if (newArr.length == 0) { proxy.$modal.msgError('暂无权限查看该系统'); return; @@ -94,8 +95,8 @@ } else { paths = route.path; //当前的路由 } - // console.log(localStorage.getItem('fromDoorXG'), paths, newArr); - // console.log('路由跳转位置--', paths); + console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222'); + console.log('路由跳转位置--', paths); router.push(paths); //重定向打开路由 sidebarRouters.value = newArr; //添加子菜单 // 海绵综合一张图,不显示左侧菜单列表 diff --git a/src/permission.js b/src/permission.js index cced843..2d58b89 100644 --- a/src/permission.js +++ b/src/permission.js @@ -12,13 +12,13 @@ NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/auth-redirect', '/bind', '/door', '/autoLogin']; +const whiteList = ['/login', '/auth-redirect', '/bind', '/door', '/autoLogin', '/chengguanweiScreen']; router.beforeEach((to, from, next) => { - console.log(from.path); + // console.log(from.path, '111'); // 跳转各个子系统时只显示各自对应的菜单内容设置 - if (from.path == '/door' || from.path == '/autoLogin') { - localStorage.setItem('fromDoorXG', 'door'); + if (from.path == '/chengguanweiScreen' || from.path == '/autoLogin') { + localStorage.setItem('fromDoorXG', 'chengguanweiScreen'); } else { localStorage.setItem('fromDoorXG', 'other'); } diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 356989b..713a72e 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -14,14 +14,14 @@ sidebarRouters: [], }), actions: { - setRoutes (routes) { + setRoutes(routes) { this.addRoutes = routes; this.routes = constantRoutes.concat(routes); }, - setSidebarRouters (routes) { + setSidebarRouters(routes) { this.sidebarRouters = routes; }, - generateRoutes (roles) { + generateRoutes(roles) { return new Promise(resolve => { // 向后端请求路由数据 getRouters('').then(res => { @@ -33,8 +33,8 @@ resolve(rewriteRoutes); // console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 - if (localStorage.getItem('fromDoorXG') == 'door') { - localStorage.setItem('routerPartXG', rewriteRoutes[0].name); //默认加载第一个菜单 + if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { + localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 } else { router.push({ path: '/sponeScreen/HaiMianScreen' }); } @@ -45,7 +45,7 @@ }); // 遍历后台传来的路由字符串,转换为组件对象 -function filterAsyncRouter (asyncRouterMap, lastRouter = false, type = false) { +function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { return asyncRouterMap.filter(route => { route.componentfullPath = route.component; if (type && route.children) { @@ -73,7 +73,7 @@ }); } -function filterChildren (childrenMap, lastRouter = false) { +function filterChildren(childrenMap, lastRouter = false) { var children = []; childrenMap.forEach((el, index) => { if (el.children && el.children.length) { @@ -98,7 +98,7 @@ } // 动态路由遍历,验证是否具备权限 -export function filterDynamicRoutes (routes) { +export function filterDynamicRoutes(routes) { const res = []; routes.forEach(route => { if (route.permissions) {