From e1ac26d7d749012a04afa8f98acf8607cbf0fbfe Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 九月 2025 14:19:58 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/layouts/AppLayout.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 837c9bb..cf6447e 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -12,40 +12,40 @@
</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>
<script>
import { mapState } from 'vuex'
import Header from '@/components/common/Header'
+import BaseComputHeight from '@/components/base/BaseComputHeight'
import CommonHeader from '@/components/common/CommonHeader'
import Menu from '@/components/common/Menu'
export default {
+ extends: BaseComputHeight,
name: 'DefaultLayout',
components: { AppHeader: Header, Menu, CommonHeader },
data() {
return {
+ cachedViews:['abccdd'],
isFinishData: false,
- orgBackground: ''
+ orgBackground: ''
}
},
computed: {
...mapState(['menuData', 'userInfo'])
},
+ mounted() {
- mounted() {
- },
-
- methods: {
-
+ },
+ methods: {
},
}
</script>
@@ -55,17 +55,16 @@
.el-container {
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;
@@ -83,13 +82,14 @@
// 鍙宠竟鍐呭
.el-main {
width: 100%;
- // height: 100%;
- height: calc(100vh - 90px);
+ //height: 100%;
+ overflow: hidden;
+ height: calc(100vh - 60px);
padding: 0;
position: relative;
display: flex;
flex-direction: column;
- overflow-y: scroll;
+ //overflow-y: scroll;
overflow-x: hidden;
scrollbar-width: none; /* firefox */
-ms-overflow-style: none; /* IE 10+ */
@@ -103,7 +103,7 @@
& > main {
height: 100%;
box-sizing: border-box;
- overflow-y: auto;
+ /* overflow-y: auto; */
}
}
}
--
Gitblit v1.9.3