Merge branch 'develop' into FOTON

src/pages/loginVerify/index.vue

@@ -8,7 +8,7 @@
     import axios from 'axios'
     import util from 'util'
     import { get_verify_by_instance,loginIdm,getMenu } from 'api/process'
-    import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
+    import { ssoLoginUrlDev,ssoLogoutUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
 
     export default {
         name: 'LoginVerify',
@@ -135,9 +135,10 @@
                 if (res.ok) {
                     this.loginNew(res)
                 } else {
-                  // this.$message.warning('系统无权限访问')
-                  // window.location.href = 'http://sso.foton.com.cn/logout?service='
-                    window.location.href = ssoLoginUrlDev
+                  this.$message.warning('系统无权限访问')
+                  this.$store.dispatch('logout')
+                    // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                   window.location.href = ssoLogoutUrlDev
                 }
             })