diff --git a/src/components/Header.vue b/src/components/Header.vue index cb151ce..0f5cc37 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -96,7 +96,7 @@ export default { // window.open("https://caddmuat.changan.com.cn/cas/logout?service=http://10.64.23.30:7766/home", '_self'); // 测试 // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); - this.$router.push('/login') + this.$router.push('https://iam.faw-vw.com/esc-sso/logout?service=http%3A%2F%2F10.94.1.164%3A8888%2FcheckPage') }) }) }, diff --git a/src/router-guard.js b/src/router-guard.js index e4c4d58..a5a48b2 100644 --- a/src/router-guard.js +++ b/src/router-guard.js @@ -13,7 +13,6 @@ router.beforeEach(async (to, from, next) => { vue.prototype.$cookies.set("JSESSIONID", localStorage.getItem('cookie'), {expires: "7D"}); // 不能再去登录页面 if (to.path === '/login' ||to.path === '/loginout' ||to.path === '/checkPage') { - next({ path: store.getters.pathUrl }) } else { next() diff --git a/vue.config.js b/vue.config.js index 1f3e690..2de8cde 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,12 +16,14 @@ module.exports = { proxy: { // 配置跨域 '/api': { - target: 'http://localhost:7060', // 服务器 + //10.0.10.173 + //10.0.10.97 + target: 'http://10.0.10.173:7060', // 服务器 changeOrigin: true }, // 请求静态图片配置项 '/api/home/pic': { - target: 'http://10.94.1.164:7061', // 图片请求的nginx网址 + target: 'http://10.94.1.164:7060', // 图片请求的nginx网址 changeOrigin: true }