From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/AppLayout.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 857b53a..b2495b3 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -55,7 +55,6 @@
.el-container {
background: #F7F8F9;
height: 100%;
-
display: flex;
// overflow: hidden;
overflow: scroll;
@@ -83,13 +82,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