Merge branch 'develop' into FOTON

src/App.vue

@@ -83,7 +83,7 @@
 
 <script>
 import {mapGetters, mapState} from 'vuex'
-import {webLoginType} from '@/sysConfig'
+import {webLoginType,ssoLogoutUrlDev} from '@/sysConfig'
 
 export default {
   name: 'App',
@@ -105,7 +105,8 @@ export default {
           roundButton: false
         }).then(() => {
           if (webLoginType != null && webLoginType === 'idm') {
-            window.location.href = 'http://sso.foton.com.cn/logout?service='
+            this.$store.dispatch('logout')
+            window.location.href = ssoLogoutUrlDev
             // this.$http.post('logout', {}, res => {
             //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
             // })

src/components/navMenu/index.vue

@@ -281,13 +281,13 @@
             menuId: 'asfdew33',
             isChildren: true // 判断没有子菜单
           },
-          {
+          /*{
             title: '资料中心',
             path: '/dataCenter',
             'icon-class': 'el-icon-s-order',
             menuId: '',
             isChildren: true // 判断没有子菜单
-          },
+          },*/
           // {
           //   title: '技术要求清单',
           //   path: '/skillReq',

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('系统无权限访问')
+                  this.$message.warning('系统无权限访问')
-                  // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                  this.$store.dispatch('logout')
-                    window.location.href = ssoLoginUrlDev
+                    // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                   window.location.href = ssoLogoutUrlDev
                 }
             })
 

src/sysConfig/index.js

@@ -13,6 +13,8 @@ const devIp = '10.19.11.243'
 const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
+
+const ssoLogout = 'http://sso.foton.com.cn/logout?service='
 // 配置 前端服务
 const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
@@ -60,6 +62,7 @@ module.exports = {
     baseUrl: 'https://' + serverIP + ':' + interfacePORT,
     webLoginType: webLoginType,
     ssoLoginUrlDev: ssoLogin + devWebUrl,
+    ssoLogoutUrlDev: ssoLogout + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
     kkFileViewUrl: kkFileViewUrl,