From a76c5c86ac9af71da45bf78c825a2c7aa843b4c8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 一月 2024 15:35:54 +0800
Subject: [PATCH] Revert "Mr.Shi"
---
platform/src/layouts/AppLayout.vue | 112 ++++++++++++--------------------------------------------
1 files changed, 24 insertions(+), 88 deletions(-)
diff --git a/platform/src/layouts/AppLayout.vue b/platform/src/layouts/AppLayout.vue
index c0aa936..476998f 100644
--- a/platform/src/layouts/AppLayout.vue
+++ b/platform/src/layouts/AppLayout.vue
@@ -1,49 +1,31 @@
<template>
- <div>
- <CommonHeader />
- <div style="height:10px; background: #fff"></div>
- <el-container class="app-layout">
- <el-aside :class="{collapse:menuData.collapse}">
- <Menu/>
- </el-aside>
- <el-main>
- <header>
- <AppHeader/>
- </header>
- <div style="height:10px;"></div>
- <main>
- <transition name="fade">
- <keep-alive>
- <router-view></router-view>
- </keep-alive>
- </transition>
- </main>
- </el-main>
- </el-container>
-
- </div>
+ <el-container class="app-layout">
+ <el-aside :class="{collapse:menuData.collapse}">
+ <Menu/>
+ </el-aside>
+ <el-main>
+ <header>
+ <AppHeader/>
+ </header>
+ <main>
+ <transition name="fade">
+ <router-view></router-view>
+ </transition>
+ </main>
+ </el-main>
+ </el-container>
</template>
<script>
import { mapState } from 'vuex'
import Header from '@/components/common/Header'
-import CommonHeader from '@/components/common/CommonHeader'
import Menu from '@/components/common/Menu'
export default {
name: 'DefaultLayout',
- components: { AppHeader: Header, Menu, CommonHeader },
- data() {
- return {
- isFinishData: false
- }
- },
+ components: { AppHeader: Header, Menu },
computed: {
- ...mapState(['menuData', 'userInfo'])
- },
-
- methods: {
-
- },
+ ...mapState(['menuData'])
+ }
}
</script>
@@ -52,27 +34,17 @@
.el-container {
background: #F7F8F9;
height: 100%;
-
display: flex;
- // overflow: hidden;
- overflow: scroll;
+ overflow: hidden;
// 宸﹁竟鑿滃崟
.el-aside {
width: $menu-width !important;
flex-shrink: 0;
- // height: 100%;
- // height: 900px;
- height: calc(100vh - 80px);
- overflow-y: scroll;
- overflow-x: hidden;
+ height: 100%;
+ overflow-y: auto;
background: $primary-color;
color: #fff;
transition: width ease .3s;
- scrollbar-width: none; /* firefox */
- -ms-overflow-style: none; /* IE 10+ */
- &::-webkit-scrollbar {
- display: none; /* Chrome Safari */
- }
&.collapse {
width: 64px !important;
}
@@ -80,21 +52,14 @@
// 鍙宠竟鍐呭
.el-main {
width: 100%;
- // height: 100%;
- height: calc(100vh - 90px);
+ height: 100%;
padding: 0;
position: relative;
display: flex;
flex-direction: column;
- overflow-y: scroll;
- overflow-x: hidden;
- scrollbar-width: none; /* firefox */
- -ms-overflow-style: none; /* IE 10+ */
- &::-webkit-scrollbar {
- display: none; /* Chrome Safari */
- }
+ overflow: hidden;
& > header {
- height: 48px;
+ height: $header-height;
flex-shrink: 0;
}
& > main {
@@ -115,34 +80,5 @@
opacity: 0;
transition: all .5s;
position: absolute;
-}
-.comfirm {
- position: absolute;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- background-color: rgba(0, 0, 0, 0.3);
- z-index: 1000;
- .container {
- position: absolute;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- margin: auto;
- background-color: #fff;
- width: 500px;
- height: 120px;
- padding: 30px;
- box-sizing: border-box;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- .complete {
- display: flex;
- flex-direction: row-reverse;
- }
- }
}
</style>
--
Gitblit v1.9.3