+
+ 正在加载数据
From 1baf666c376a66eaa79ffd7e7df13653007e40f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 15 Apr 2022 15:59:19 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/drawer.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/assets/styles/drawer.less b/src/assets/styles/drawer.less
index ca01dd517..49276d4e8 100644
--- a/src/assets/styles/drawer.less
+++ b/src/assets/styles/drawer.less
@@ -14,7 +14,7 @@
}
.el-drawer__body{
height: 100%;
- //overflow-y: auto;
+ overflow-y: auto;
display: flex;
flex-direction: column;
// 底部带 提交、取消按钮
From f2407cca45b07e40add17127894bf47d6f1cec2d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 15 Apr 2022 16:20:49 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=AC=E5=BC=80=E6=90=9C=E7=B4=A2=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=20=E5=A4=96=E9=83=A8=E8=AE=BF=E9=97=AE=20=E5=A4=96?=
=?UTF-8?q?=E9=83=A8=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E4=BE=9D=E6=97=A7?=
=?UTF-8?q?=E4=BB=A5=E8=8F=9C=E5=8D=95ID=E6=9D=83=E9=99=90=E5=88=A4?=
=?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/loginVerifyNoEncryption/index.vue | 69 +++++++++++++++------
1 file changed, 51 insertions(+), 18 deletions(-)
diff --git a/src/pages/loginVerifyNoEncryption/index.vue b/src/pages/loginVerifyNoEncryption/index.vue
index 98db12ca3..0a3cf1066 100644
--- a/src/pages/loginVerifyNoEncryption/index.vue
+++ b/src/pages/loginVerifyNoEncryption/index.vue
@@ -22,6 +22,17 @@
}
},
methods: {
+ logout(){
+ this.$store.dispatch('logout')
+ this.$alert('您没有系统访问权限，请联系管理员进行授权', '提示', {
+ confirmButtonText: '确定',
+ type: 'warning',
+ showClose: false,
+ showCancelButton: false,
+ }).then(() => {
+ window.location.href = ssoLogoutUrlDev
+ })
+ },
/**
* @description: 获取菜单logout
* @author: chenxiaoxi
@@ -50,17 +61,47 @@
userInfoObj.userId = userInfoObj.usid
window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
this.setToken(userInfoObj.token) // vuex存储token
- // this.$router.push('/home1')
- let routerUrl = localStorage.getItem("routerUrl");
- let routerParam = localStorage.getItem("routerParam");
- // 路由跳转
- if(routerParam && routerParam !== ''){
- const UA = navigator.userAgent.toLocaleLowerCase()
- if (UA.match(/msie/) != null || UA.match(/trident/) != null) {
- alert('为了最佳显示效果 请使用google chrome')
+ let userInfo = {}
+ for (let key in userInfoObj) {
+ if (key !== 'uname') {
+ userInfo[key] = userInfoObj[key]
+ } else {
+ userInfo.uName = userInfoObj[key]
}
- this.$router.push('/'+routerUrl)
}
+ this.setUserInfo(JSON.stringify((userInfo)))
+ // this.resetTime()
+ // 获取用户菜单
+ window.sessionStorage.setItem('userInfo', userInfo); // del
+ this.getMenu().then((menuList) => {
+ let hasHomeMenu = false
+ menuList.map((menuItem) => {
+ if (menuItem.id === 'asdfadf') {
+ hasHomeMenu = true
+ }
+ })
+ window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
+ window.sessionStorage.setItem('menuList', menuList); // del
+ if (hasHomeMenu) {
+ this.setMenu(JSON.stringify(menuList)).then(res => {
+ // this.$router.push('/home1')
+ let routerUrl = localStorage.getItem("routerUrl");
+ let routerParam = localStorage.getItem("routerParam");
+ // 路由跳转
+ if(routerParam && routerParam !== ''){
+ const UA = navigator.userAgent.toLocaleLowerCase()
+ if (UA.match(/msie/) != null || UA.match(/trident/) != null) {
+ alert('为了最佳显示效果 请使用google chrome')
+ }
+ this.$router.push('/'+routerUrl)
+ }
+ }, e => {
+ this.logout()
+ })
+ } else {
+ this.logout()
+ }
+ })
},
...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
...mapActions(['setMenu'])
@@ -79,15 +120,7 @@
this.loginNew(res)
} else {
if(res.respCode && res.respCode === 'r0011'){
- this.$store.dispatch('logout')
- this.$alert('您没有系统访问权限，请联系管理员进行授权', '提示', {
- confirmButtonText: '确定',
- type: 'warning',
- showClose: false,
- showCancelButton: false,
- }).then(() => {
- window.location.href = ssoLogoutUrlDev
- })
+ this.logout()
}
}
})