From b8e502b168042a4217ce4d0e30b36a12ee447691 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 15 Jan 2025 08:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                          |  2 +-
 .../src/layouts/components/Main/index.vue     | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 323e4e5..c94b96e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -5,7 +5,7 @@
     :size='assemblySize'
     :button='buttonConfig'
   >
-    <router-view :key='$route.fullPath' />
+    <router-view  />
   </el-config-provider>
 </template>
 
diff --git a/frontend/src/layouts/components/Main/index.vue b/frontend/src/layouts/components/Main/index.vue
index 2f29123..454f07c 100644
--- a/frontend/src/layouts/components/Main/index.vue
+++ b/frontend/src/layouts/components/Main/index.vue
@@ -2,21 +2,15 @@
   <Maximize v-show="maximize" />
   <Tabs v-if="tabs && showMenuFlag" />
   <el-main>
-    <!-- style="height: calc(100vh - 157px);overflow-y:auto; overflow-x:hidden;" :style='{height:showMenuFlag?"calc(100vh - 157px)":" calc(100vh - 120px)"}' -->
     <router-view v-slot="{ Component, route }" style="height:100%;">
-      <transition appear name="fade-transform" mode="out-in">
-        <keep-alive :include="keepAliveName">
-          <component
-            :is="Component"
-            v-if="isRouterShow"
-            :key="route.fullPath"
-          />
+      <!-- <transition  name="slide-right" mode="out-in"> -->
+        <keep-alive :include="keepAliveName" >
+          <component :is="Component" :key="route.fullPath" />
         </keep-alive>
-      </transition>
+      <!-- </transition> -->
     </router-view>
   </el-main>
-  <el-footer >
-    <!-- v-show="footer" -->
+  <el-footer>
     <Footer />
   </el-footer>
 </template>
@@ -31,12 +25,14 @@ import Maximize from "./components/Maximize.vue";
 import Tabs from "@/layouts/components/Tabs/index.vue";
 import Footer from "@/layouts/components/Footer/index.vue";
 import { useAuthStore } from "@/stores/modules/auth";
+import { useRoute, type RouteLocationNormalized } from 'vue-router'
 const globalStore = useGlobalStore();
 const authStore = useAuthStore();
 const { maximize, isCollapse, layout, tabs, footer } = storeToRefs(globalStore);
-
+const route = useRoute()
 const keepAliveStore = useKeepAliveStore();
 const { keepAliveName } = storeToRefs(keepAliveStore);
+// console.log("🚀 ~ keepAliveName:", keepAliveName)
 //是否显示导航栏
 const showMenuFlag = computed(() => authStore.showMenuFlagGet);
 // 注入刷新页面方法
@@ -64,6 +60,14 @@ watch(
   },
   { immediate: true }
 );
+watch(
+  () => route.path,
+  () => {
+    console.log(123, route.path);
+
+  },
+
+);
 
 // 监听窗口大小变化，折叠侧边栏
 const screenWidth = ref(0);