diff --git a/.env.production b/.env.production index 242b46892..76d0b153f 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = http://172.20.46.177/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_CUSTOMER=yantai diff --git a/src/router/index.js b/src/router/index.js index 9ba8abf56..ec3552213 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,17 +26,37 @@ export const pageRoutes = [ }, }, { - path: "/login", + path: "/login-local", component: () => { return CUSTOMER == "yantai" ? import("@/views/pages/yantai-login") : import("@/views/pages/login"); }, + name: "login-local", + meta: { + title: "登录", + }, + }, + { + path: "/login/", + component: () => { + return import("@/views/pages/yantai-login-transit"); + }, name: "login", meta: { title: "登录", }, }, + { + path: "/login", + name: "login2", + meta: { + title: "登录", + }, + redirect: { + name: "login", + }, + }, { path: "/", name: "index", diff --git a/src/utils/request.js b/src/utils/request.js index 7de9ad4cb..3ca739de6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,13 +54,6 @@ http.interceptors.response.use(response => { const code = [10007, 401, 10001, 10005] if (code.includes(response.data.code)) { clearLoginInfo() - // localStorage.setItem('userType', 'work') - // let userType = localStorage.getItem("userType"); - // if (userType === 'work'){ - // router.replace({ name: 'loginWork' }) - // }else { - // router.replace({ name: 'login' }) - // } router.replace({ name: 'login' }) return Promise.reject(response.data.msg) @@ -71,4 +64,23 @@ http.interceptors.response.use(response => { return Promise.reject(error) }) + +http.put = function (url, data, config) { + return http.post(url, data, { + ...config, + headers: { + "X-HTTP-Method-Override": "PUT", + }, + }); +}; + +http.delete = function (url, config) { + return http.post(url, config.data || {}, { + // ...config, + headers: { + "X-HTTP-Method-Override": "DELETE", + }, + }); +}; + export default http diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index abcd89837..b68506cd1 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,10 +8,12 @@

{{ - $store.state.user.agencyName + $store.state.user.agencyName }} {{ - $store.state.user.agencyName .slice(0, 2) + $store.state.user.agencyName + ? $store.state.user.agencyName.slice(0, 2) + : "" }}

@@ -48,7 +50,7 @@ { - //关闭所有标签页 - // tabs, 关闭全部 - this.$store.state.contentTabs = this.$store.state.contentTabs.filter( - (item) => item.name === "home" - ); - this.$http .post("/auth/login/logout") .then(({ data: res }) => { @@ -228,12 +226,14 @@ export default { } clearLoginInfo(); - this.$router.push({ name: "login" }); - // if (localStorage.getItem('userType') === 'work') { - // this.$router.push({ name: 'loginWork' }) - // } else { - // this.$router.push({ name: 'login' }) - // } + logout(); + + //关闭所有标签页 + this.$store.state.contentTabs = + this.$store.state.contentTabs.filter( + (item) => item.name === "home" + ); + // this.$router.push({ name: "login" }); }) .catch(() => {}); }) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 94e303e02..b94a3efca 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -3,9 +3,13 @@