From 3b710d9e99871509b679461f51ec1e7e239d06b0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 十一月 2024 15:28:24 +0800
Subject: [PATCH] update typescript 5.4.5 => 5.7.2 update vite 5.2.12 => 5.4.11 update vue 3.4.34 => 3.5.13 update element-plus 2.7.8 => 2.8.8 update .... 其他依赖版本升级

---
 src/layout/components/Navbar.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49018ce..bfe339e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,6 +9,7 @@
         <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyName"
+          class="min-w-244px"
           clearable
           filterable
           reserve-keyword
@@ -92,11 +93,12 @@
 import useAppStore from '@/store/modules/app';
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
+import useNoticeStore from '@/store/modules/notice';
 import { getTenantList } from '@/api/login';
 import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
-import useNoticeStore from '@/store/modules/notice';
+import router from "@/router";
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -127,6 +129,7 @@
     dynamic.value = true;
     proxy?.$tab.closeAllPage();
     proxy?.$router.push('/');
+    proxy?.$tab.refreshPage();
   }
 };
 
@@ -135,11 +138,12 @@
   dynamic.value = false;
   proxy?.$tab.closeAllPage();
   proxy?.$router.push('/');
+  proxy?.$tab.refreshPage();
 };
 
 /** 绉熸埛鍒楄〃 */
 const initTenantList = async () => {
-  const { data } = await getTenantList();
+  const { data } = await getTenantList(true);
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
     tenantList.value = data.voList;
@@ -160,8 +164,14 @@
     cancelButtonText: '鍙栨秷',
     type: 'warning'
   });
-  await userStore.logout();
-  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  userStore.logout().then(() => {
+    router.replace({
+      path: '/login',
+      query: {
+        redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+      }
+    })
+  });
 };
 
 const emits = defineEmits(['setLayout']);

--
Gitblit v1.9.3