推出

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");
+}

src/views/main-navbar.vue

@@ -11,7 +11,9 @@
             $store.state.user.agencyName
           }}</a>
           <a class="aui-navbar__brand-mini" href="javascript:;">{{
-            $store.state.user.agencyName.slice(0, 2)
+            $store.state.user.agencyName
+              ? $store.state.user.agencyName.slice(0, 2)
+              : ""
           }}</a>
         </h1>
       </div>
@@ -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(() => {});
         })

src/views/main-shuju/main-navbar.vue

@@ -3,9 +3,13 @@
     <nav v-if="showHeader" class="m-navbar">
       <div class="navbar__header">
         <h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
-          <a class="navbar__brand-lg" href="javascript:;">{{ $store.state.user.agencyName }}</a>
+          <a class="navbar__brand-lg" href="javascript:;">{{
+            $store.state.user.agencyName
+          }}</a>
           <a class="navbar__brand-mini" href="javascript:;">{{
-            $store.state.user.agencyName.slice(0, 2)
+            $store.state.user.agencyName
+              ? $store.state.user.agencyName.slice(0, 2)
+              : ""
           }}</a>
         </h1>
       </div>
@@ -141,6 +145,8 @@ import { mapGetters } from "vuex";
 import screenfull from "screenfull";
 import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
 import { clearLoginInfo } from "@/utils";
+import { logout } from "@/utils/yantai-transit";
+
 export default {
   inject: ["refresh"],
   data() {
@@ -167,10 +173,15 @@ export default {
     const customerId = localStorage.getItem("customerId");
     let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
     //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
-    if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
-      for (let index in siteconfigElement){
-        if (siteconfigElement[index].id == '6'){
-          let newMenuArr =  siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
+    if (
+      "04c0d396e298f13e57aa5904a657eaa6" != customerId &&
+      "3fdd0380deff5b30f45376cdf995d1c1" != customerId
+    ) {
+      for (let index in siteconfigElement) {
+        if (siteconfigElement[index].id == "6") {
+          let newMenuArr = siteconfigElement[index].children.filter(
+            (item) => item.id !== "duoyuanfuwufenxi"
+          );
           siteconfigElement[index].children = newMenuArr;
         }
       }
@@ -226,12 +237,6 @@ export default {
         }
       )
         .then(() => {
-          //关闭所有标签页
-          // tabs, 关闭全部
-          this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === "home2"
-          );
-
           this.$http
             .post("/auth/login/logout")
             .then(({ data: res }) => {
@@ -243,8 +248,14 @@ export default {
               }
 
               clearLoginInfo();
+              logout();
 
-              this.$router.push({ name: "login" });
+              //关闭所有标签页
+              this.$store.state.contentTabs =
+                this.$store.state.contentTabs.filter(
+                  (item) => item.name === "home2"
+                );
+              // this.$router.push({ name: "login" });
             })
             .catch(() => {});
         })

src/views/pages/yantai-login-transit.vue

@@ -9,6 +9,7 @@
 
 <script>
 import { requestPost } from "@/js/dai/request";
+import { toLoginPage } from "@/utils/yantai-transit";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
 export default {
@@ -35,12 +36,7 @@ export default {
       await this.login(code);
       loading.close();
     } else {
-      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");
+      toLoginPage();
     }
   },