浏览代码

登录加上【标准】登录类型

yuhan 7 月之前
父节点
当前提交
7dfdfb476a
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 3 2
      src/permission.js
  2. 3 3
      src/store/modules/user.js

+ 3 - 2
src/permission.js

@@ -32,7 +32,7 @@ router.beforeEach((to, from, next) => {
   // param.username = 'iotedge@iotedge.sense'
   // param.token = cookie.get('EIToken')
   // param.username = cookie.get('WISEUser')
-  var loginType = cookie.get('NameType')
+  var loginType = cookie.get('EIName')
   if(loginType === 'SSO'){
     store.dispatch('TzLogin').then(response => {
       // 有EIToken
@@ -97,7 +97,8 @@ router.beforeEach((to, from, next) => {
         NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
       }
     })
-  } else {
+  }
+  if(loginType === 'SYSTEM' || !loginType){
     if (Vue.ls.get(ACCESS_TOKEN)) {
       /* has token */
       if (to.path === '/user/login' || to.path === OAUTH2_LOGIN_PAGE_PATH) {

+ 3 - 3
src/store/modules/user.js

@@ -92,7 +92,7 @@ const user = {
             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
             commit('SET_AVATAR', userInfo.avatar)
 
-            cookie.set('NameType', 'SYSTEM')
+            cookie.set('EIName', 'SYSTEM')
 
             resolve(response)
           }else{
@@ -198,7 +198,7 @@ const user = {
           }
           // 删除登录账号类型
           // cookie.remove('EIToken')
-          cookie.remove('NameType')
+          cookie.remove('EIName')
           resolve()
         }).catch(() => {
           resolve()
@@ -245,7 +245,7 @@ const user = {
             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
             commit('SET_AVATAR', userInfo.avatar)
 
-            cookie.set('NameType', 'SSO')
+            cookie.set('EIName', 'SSO')
 
             resolve(response)
           }else{