From 06b2f5be922e87d086d1d4e6cdcc2119e7d3a1a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 14:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/AppLayout.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 58730f9..cf6447e 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -12,14 +12,13 @@
</header>
<main ref="containerS">
<transition name="fade">
-<!-- <keep-alive>-->
+ <keep-alive :include="cachedViews">
<router-view></router-view>
-<!-- </keep-alive>-->
+ </keep-alive>
</transition>
</main>
</el-main>
</el-container>
-
</div>
</template>
@@ -35,6 +34,7 @@
components: { AppHeader: Header, Menu, CommonHeader },
data() {
return {
+ cachedViews:['abccdd'],
isFinishData: false,
orgBackground: ''
}
@@ -45,9 +45,7 @@
mounted() {
},
-
- methods: {
-
+ methods: {
},
}
</script>
@@ -58,15 +56,15 @@
background: #F7F8F9;
height: 100%;
display: flex;
- // overflow: hidden;
- overflow: scroll;
+ overflow: hidden;
+ //overflow: scroll;
// 宸﹁竟鑿滃崟
.el-aside {
width: $menu-width !important;
flex-shrink: 0;
// height: 100%;
// height: 900px;
- height: calc(100vh - 80px);
+ height: calc(100vh - 60px);
overflow-y: scroll;
overflow-x: hidden;
background: #fff;
@@ -86,7 +84,7 @@
width: 100%;
//height: 100%;
overflow: hidden;
- height: calc(100vh - 94px);
+ height: calc(100vh - 60px);
padding: 0;
position: relative;
display: flex;
--
Gitblit v1.9.3