From bdad06349901c13f8ce2c9381a3ace2b7f80c652 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 14:33:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/AppLayout.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 857b53a..58730f9 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -26,23 +26,25 @@
<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 {
isFinishData: false,
- orgBackground: ''
+ orgBackground: ''
}
},
computed: {
...mapState(['menuData', 'userInfo'])
},
+ mounted() {
- mounted() {
- },
+ },
methods: {
@@ -55,7 +57,6 @@
.el-container {
background: #F7F8F9;
height: 100%;
-
display: flex;
// overflow: hidden;
overflow: scroll;
@@ -83,13 +84,14 @@
// 鍙宠竟鍐呭
.el-main {
width: 100%;
- // height: 100%;
- height: calc(100vh - 90px);
+ //height: 100%;
+ overflow: hidden;
+ height: calc(100vh - 94px);
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+ */
--
Gitblit v1.9.3