From 238e5b156dc2e67bcab5d81a0ec38e8f0f7dbf62 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Feb 2022 11:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-navbar.vue            | 113 +++++++++++++--------------
 src/views/main-shuju/main-navbar.vue |   9 ++-
 src/views/main-shuju/main.vue        |   8 +-
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 24cd80bd..febbcd0c 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -46,9 +46,7 @@
           mode="horizontal"
           class="aui-navbar__menu mr-auto z-div"
         >
-          <el-menu-item
-            @click="toIndexPage"
-          >
+          <el-menu-item @click="toIndexPage">
             <span>首页</span>
           </el-menu-item>
 
@@ -104,12 +102,11 @@
                 <i class="el-icon-arrow-down"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="updatePasswordHandle()"
-                  >{{ $t('updatePassword.title') }}</el-dropdown-item
-                >
+                <el-dropdown-item @click.native="updatePasswordHandle()">{{
+                  $t("updatePassword.title")
+                }}</el-dropdown-item>
                 <el-dropdown-item @click.native="logoutHandle()">{{
-                  $t('logout')
+                  $t("logout")
                 }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -127,119 +124,121 @@
 </template>
 
 <script>
-import { messages } from '@/i18n'
-import { mapGetters } from 'vuex'
-import screenfull from 'screenfull'
-import UpdatePasswordWork from './main-navbar-update-password-work'
-import { clearLoginInfo } from '@/utils'
+import { messages } from "@/i18n";
+import { mapGetters } from "vuex";
+import screenfull from "screenfull";
+import UpdatePasswordWork from "./main-navbar-update-password-work";
+import { clearLoginInfo } from "@/utils";
 export default {
-  inject: ['refresh'],
+  inject: ["refresh"],
   data() {
     return {
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,
-      customerName: localStorage.getItem('customerName')
-    }
+      customerName: "",
+    };
   },
   components: {
-    UpdatePasswordWork
+    UpdatePasswordWork,
   },
   created() {
-    let platformToken = localStorage.getItem('showHeader') || ''
+    let platformToken = localStorage.getItem("showHeader") || "";
     if (
-      typeof platformToken !== 'undefined' &&
-      platformToken !== 'undefined' &&
-      platformToken !== ''
+      typeof platformToken !== "undefined" &&
+      platformToken !== "undefined" &&
+      platformToken !== ""
     ) {
-      this.showHeader = false
+      this.showHeader = false;
     }
-    console.log('=============================', this.userType)
+    this.changeCustomerName();
+    console.log("=============================", this.userType);
   },
   computed: {
     userType() {
-      return localStorage.getItem('userType')
-    }
+      return localStorage.getItem("userType");
+    },
   },
   methods: {
-    toIndexPage(){
-      this.$router.replace('/indexWork')
+    toIndexPage() {
+      this.$router.replace("/indexWork");
     },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(
+      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
         (item) => item.meta.menuId === menuId
-      )[0]
+      )[0];
       if (route) {
-        this.$router.push({ name: route.name })
+        this.$router.push({ name: route.name });
       }
-      this.$store.state.LevelOneMenuActiveName = menuId
+      this.$store.state.LevelOneMenuActiveName = menuId;
       this.$store.state.sidebarActiveSubMenuList =
-        this.$store.state.sidebarMenuList[idx].children || []
+        this.$store.state.sidebarMenuList[idx].children || [];
     },
     changeCustomerName(customerName) {
-      this.customerName = localStorage.getItem('customerName')
+      this.customerName =
+        localStorage.getItem("customerName") || "党建引领基层治理互联管理平台";
     },
     // 全屏
     fullscreenHandle() {
       if (!screenfull.enabled) {
         return this.$message({
-          message: this.$t('fullscreen.prompt'),
-          type: 'warning',
-          duration: 500
-        })
+          message: this.$t("fullscreen.prompt"),
+          type: "warning",
+          duration: 500,
+        });
       }
-      screenfull.toggle()
+      screenfull.toggle();
     },
     // 修改密码
     updatePasswordHandle() {
-      this.updatePassowrdVisible = true
+      this.updatePassowrdVisible = true;
       this.$nextTick(() => {
-        this.$refs.updatePassowrd.init()
-      })
+        this.$refs.updatePassowrd.init();
+      });
     },
     // 退出
     logoutHandle() {
       this.$confirm(
-        this.$t('prompt.info', { handle: this.$t('logout') }),
-        this.$t('prompt.title'),
+        this.$t("prompt.info", { handle: this.$t("logout") }),
+        this.$t("prompt.title"),
         {
-          confirmButtonText: this.$t('confirm'),
-          cancelButtonText: this.$t('cancel'),
-          type: 'warning'
+          confirmButtonText: this.$t("confirm"),
+          cancelButtonText: this.$t("cancel"),
+          type: "warning",
         }
       )
         .then(() => {
           //关闭所有标签页
           // tabs, 关闭全部
           this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === 'home'
-          )
+            (item) => item.name === "home"
+          );
 
           this.$http
-            .post('/auth/login/logout')
+            .post("/auth/login/logout")
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 //别处登陆时 退出不提示 直接跳登陆页即可
                 if (res.code !== 10007) {
-                  this.$message.error(res.msg)
+                  this.$message.error(res.msg);
                 }
               }
 
-              clearLoginInfo()
-              this.$router.push({ name: 'login' })
+              clearLoginInfo();
+              this.$router.push({ name: "login" });
               // if (localStorage.getItem('userType') === 'work') {
               //   this.$router.push({ name: 'loginWork' })
               // } else {
               //   this.$router.push({ name: 'login' })
               // }
             })
-            .catch(() => {})
+            .catch(() => {});
         })
-        .catch(() => {})
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .main-line {
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 05d44587..20d28cc1 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -143,7 +143,7 @@ export default {
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,
-      customerName: localStorage.getItem("customerName"),
+      customerName: "",
     };
   },
   components: {
@@ -158,7 +158,7 @@ export default {
     // ) {
     //   this.showHeader = false;
     // }
-
+    this.changeCustomerName();
     this.$store.state.mainShuju.menuList = window.SITE_CONFIG["menuShujuList"];
   },
   computed: {},
@@ -176,8 +176,9 @@ export default {
       }
       this.$store.state.mainShuju.activeName = menuId;
     },
-    changeCustomerName(customerName) {
-      this.customerName = localStorage.getItem("customerName");
+    changeCustomerName() {
+      this.customerName =
+        localStorage.getItem("customerName") || "数据分析可视化平台";
     },
     // 全屏
     fullscreenHandle() {
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index fb0a113d..ee092f8a 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -65,9 +65,7 @@ export default {
   computed: {},
   methods: {
     changeCustomerName(customerName) {
-      this.$refs["ref_navbar"].changeCustomerName(
-        customerName || "数据分析可视化平台"
-      );
+      this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
     windowResizeHandle() {
@@ -115,7 +113,9 @@ export default {
           this.$store.state.user = { ...data };
           localStorage.setItem("roleList", data.roleList);
           localStorage.setItem("customerId", data.customerId);
-          localStorage.setItem("customerName", data.customerName || "");
+          if (!localStorage.getItem("customerName")) {
+            localStorage.setItem("customerName", data.customerName || "");
+          }
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);