...
|
...
|
@@ -33,7 +33,7 @@ |
|
|
|
|
|
<script>
|
|
|
import { requestLogin,getuserMenus } from '../api/api';
|
|
|
import routes from '../routes'
|
|
|
import rt from '../routes'
|
|
|
//import NProgress from 'nprogress'
|
|
|
export default {
|
|
|
data() {
|
...
|
...
|
@@ -66,11 +66,7 @@ |
|
|
handleReset2() {
|
|
|
this.$refs.ruleForm2.resetFields();
|
|
|
},
|
|
|
/**
|
|
|
* 处理登陆后的账号对应的菜单
|
|
|
* @param menuList
|
|
|
*/
|
|
|
handleMenuList: function (router,menu) {
|
|
|
handleMenuList : function (router,menu) {
|
|
|
var _self = this;
|
|
|
var routerName = "";
|
|
|
router.forEach(function (v_router) {
|
...
|
...
|
@@ -84,14 +80,18 @@ |
|
|
//匹配到继续判断是否子元素,有子元素继续递归
|
|
|
if (result) {
|
|
|
if(v_router.children) {
|
|
|
_self.handleMenuList(v_router.children,v_menu.children);
|
|
|
_self.handleMenuList(v_router.children,result.children);
|
|
|
}
|
|
|
//没有则可以移除
|
|
|
}else {
|
|
|
router.splice(router.findIndex(itm => itm.name === routerName ),1);
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
});
|
|
|
console.log("longined router:");
|
|
|
console.log(_self.$router.options.routes);
|
|
|
//本地存储用户目录 ,防刷新目录丢失用
|
|
|
sessionStorage.setItem('menu', JSON.stringify(_self.$router.options.routes));
|
|
|
},
|
|
|
handleSubmit2: function (ev) {
|
|
|
var _this = this;
|
...
|
...
|
@@ -105,8 +105,10 @@ |
|
|
this.logining = false;
|
|
|
//NProgress.done();
|
|
|
let status = res.status;
|
|
|
let user = res.data.principal;
|
|
|
let loginSuccess = res.data.authenticated;
|
|
|
let authentication = res.data.authentication;
|
|
|
let user = authentication.principal;
|
|
|
let loginSuccess = authentication.authenticated;
|
|
|
let loginUserMenus = res.data.loginUserMenus;
|
|
|
if (status !== 200) {
|
|
|
let msg = "登录错误";
|
|
|
this.$message({
|
...
|
...
|
@@ -115,14 +117,20 @@ |
|
|
});
|
|
|
} else if (loginSuccess) {
|
|
|
sessionStorage.setItem('user', JSON.stringify(user));
|
|
|
getuserMenus('').then(res => {
|
|
|
if(res && res.status===200){
|
|
|
_this.userMenus = res.data.list;
|
|
|
this.handleMenuList(routes.routes,_this.userMenus);
|
|
|
//本地存储用户目录 ,防刷新目录丢失用
|
|
|
sessionStorage.setItem('menu', JSON.stringify(routes.routes));
|
|
|
}
|
|
|
});
|
|
|
//处理用户menu
|
|
|
_this.userMenus = loginUserMenus.list;
|
|
|
console.log("userMenus:");
|
|
|
console.log(_this.userMenus);
|
|
|
console.log(loginUserMenus.list);
|
|
|
let sysMenus = _this.$router.options.routes;
|
|
|
|
|
|
console.log("sysMenus:");
|
|
|
console.log(sysMenus);
|
|
|
|
|
|
_this.handleMenuList(sysMenus,_this.userMenus);
|
|
|
|
|
|
console.log("user:");
|
|
|
console.log(_this.$router.options.routes);
|
|
|
this.$router.push({path: '/main'});
|
|
|
}
|
|
|
}).catch(error => {
|
...
|
...
|
|