Commit 69150983 authored by 张伯涛's avatar 张伯涛

修改

parent ccdf9625
...@@ -23,7 +23,6 @@ router.beforeEach((to, from, next) => { ...@@ -23,7 +23,6 @@ router.beforeEach((to, from, next) => {
} else { } else {
if (store.getters.roles.length === 0) { if (store.getters.roles.length === 0) {
// 判断当前用户是否已拉取完user_info信息 // 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(res => { store.dispatch('GetInfo').then(res => {
// 判断用户是否有权限 有角色 // 判断用户是否有权限 有角色
if (res.data.permissions && res.data.permissions.length > 0) { if (res.data.permissions && res.data.permissions.length > 0) {
...@@ -49,8 +48,14 @@ router.beforeEach((to, from, next) => { ...@@ -49,8 +48,14 @@ router.beforeEach((to, from, next) => {
} }
}) })
console.log('routers', routers) console.log('routers', routers)
router.addRoutes(routers.accessedRoutes) // 动态添加可访问路由表 if (routers.accessedRoutes[0].path === '/entry') {
next({ path: routers.accessedRoutes[0].children[0].path, replace: true }) // 没有首页,自动切换跳转到下一级 router.addRoutes(routers.accessedRoutes) // 动态添加可访问路由表
next({ path: '/Home', replace: true }) // hack方法 确保addRoutes已完成
} else {
router.addRoutes(routers.accessedRoutes) // 动态添加可访问路由表
next({ path: routers.accessedRoutes[0].children[0].path, replace: true }) // 没有首页,自动切换跳转到下一级
}
// next({ path: routers.accessedRoutes[0].children[0].path, replace: true }) // 没有首页,自动切换跳转到下一级
// next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 // next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
} else { } else {
Message.error('用户无权限') Message.error('用户无权限')
......
...@@ -227,14 +227,14 @@ ...@@ -227,14 +227,14 @@
</div> </div>
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox> <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox> <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<!-- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>--> <!-- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>-->
<el-tree <el-tree
ref="menu" ref="menu"
class="tree-border" class="tree-border"
:data="menuOptions" :data="menuOptions"
show-checkbox show-checkbox
node-key="id" node-key="id"
:check-strictly="!form.menuCheckStrictly" :check-strictly="false"
empty-text="加载中,请稍后" empty-text="加载中,请稍后"
:props="defaultProps" :props="defaultProps"
@check-change="addListChange" @check-change="addListChange"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment