From b62578f8b43f15be89b3d14f463f11aed03e6fb9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 09 五月 2024 18:57:25 +0800
Subject: [PATCH] 最新版本

---
 admin/src/components/common/CommonHeader.vue |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 58ec6c6..10523a8 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,7 +2,7 @@
   <div class="common-header">
     <div class="header">
       <div class="logo">
-        <div> 鍗庢櫉鍥尯</div>
+        <div>{{title}}</div>
         <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
       </div>
       <div class="user">
@@ -55,6 +55,7 @@
   },
   data () {
     return {
+      title: process.env.VUE_APP_TITLE,
       visible: {
         // 淇敼瀵嗙爜
         changePwd: false
@@ -87,9 +88,9 @@
   },
   computed: {
     ...mapState(['menuData', 'userInfo']),
-    title () {
-      return this.$route.meta.title
-    }
+    // title () {
+    //   return this.$route.meta.title
+    // }
   },
   filters: {
     // 灞曠ず鍚嶇О
@@ -104,7 +105,7 @@
     }
   },
   methods: {
-    ...mapMutations(['setUserInfo', 'switchCollapseMenu']),
+    ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
     // 淇敼瀵嗙爜
     changePwd () {
       this.visible.changePwd = true
@@ -148,8 +149,10 @@
     logout () {
       logout()
         .then(() => {
-          this.setUserInfo(null)
-          this.$router.push({ name: 'login' })
+          this.clearUserInfo()
+          // window.location.href = process.env.VUE_APP_CONTEXT_PATH
+          // this.$router.push({ name: 'login' })
+          window.location.reload()
         })
         .catch(e => {
           this.$tip.apiFailed(e)

--
Gitblit v1.9.3