From 728bacbf4470d5bbfb462082fa6c456403e10f17 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 20 Oct 2022 15:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/yantai-transit.js | 17 +++++++++++ src/views/main-navbar.vue | 21 +++++++++----- src/views/main-shuju/main-navbar.vue | 37 +++++++++++++++--------- src/views/pages/yantai-login-transit.vue | 8 ++--- 4 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 src/utils/yantai-transit.js diff --git a/src/utils/yantai-transit.js b/src/utils/yantai-transit.js new file mode 100644 index 000000000..22af0a45b --- /dev/null +++ b/src/utils/yantai-transit.js @@ -0,0 +1,17 @@ +export function logout() { + let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; + let redirect_url = encodeURIComponent(uriComponent); + let url = + "http://172.20.46.155:8080/sso/logout?client_id=1000009&redirect_url=" + + redirect_url; + window.open(url, "_self"); +} + +export function toLoginPage() { + let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/"; + let redirect_url = encodeURIComponent(uriComponent); + let url = + "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url=" + + redirect_url; + window.open(url, "_self"); +} diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index a870a077e..b68506cd1 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -11,7 +11,9 @@ $store.state.user.agencyName }} {{ - $store.state.user.agencyName.slice(0, 2) + $store.state.user.agencyName + ? $store.state.user.agencyName.slice(0, 2) + : "" }} @@ -127,6 +129,8 @@ import { mapGetters } from "vuex"; import screenfull from "screenfull"; import UpdatePasswordWork from "./main-navbar-update-password-work"; import { clearLoginInfo } from "@/utils"; +import { logout } from "@/utils/yantai-transit"; + export default { inject: ["refresh"], data() { @@ -211,12 +215,6 @@ export default { } ) .then(() => { - //关闭所有标签页 - // tabs, 关闭全部 - this.$store.state.contentTabs = this.$store.state.contentTabs.filter( - (item) => item.name === "home" - ); - this.$http .post("/auth/login/logout") .then(({ data: res }) => { @@ -228,7 +226,14 @@ export default { } clearLoginInfo(); - 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 @@