From 2bc4a739db642494accbf5be1fa55793f4652f44 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 10 三月 2025 15:31:16 +0800
Subject: [PATCH] ll
---
admin/src/layouts/AppLayout.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index d4c0be8..58730f9 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -1,7 +1,7 @@
<template>
<div>
<CommonHeader />
- <div style="height:10px; background: #fff"></div>
+ <!-- <div style="height:10px; background: #fff"></div> -->
<el-container class="app-layout">
<el-aside :class="{collapse:menuData.collapse}">
<Menu/>
@@ -10,7 +10,6 @@
<header>
<AppHeader/>
</header>
- <div style="height:10px;"></div>
<main ref="containerS">
<transition name="fade">
<!-- <keep-alive>-->
@@ -27,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: {
@@ -56,7 +57,6 @@
.el-container {
background: #F7F8F9;
height: 100%;
-
display: flex;
// overflow: hidden;
overflow: scroll;
@@ -69,8 +69,8 @@
height: calc(100vh - 80px);
overflow-y: scroll;
overflow-x: hidden;
- background: $primary-color;
- color: #fff;
+ background: #fff;
+ color: #333333;
transition: width ease .3s;
scrollbar-width: none; /* firefox */
-ms-overflow-style: none; /* IE 10+ */
@@ -84,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+ */
@@ -104,7 +105,7 @@
& > main {
height: 100%;
box-sizing: border-box;
- overflow-y: auto;
+ /* overflow-y: auto; */
}
}
}
--
Gitblit v1.9.3