From c24a5a2a99515b365ebc343b04538bb862790de1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十二月 2023 11:44:22 +0800
Subject: [PATCH] Merge branch 'feature-code-refactoring' and 'feature-002'
---
src/components/layout/AppLayout.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/components/layout/AppLayout.vue b/src/components/layout/AppLayout.vue
index c946660..f4c7603 100644
--- a/src/components/layout/AppLayout.vue
+++ b/src/components/layout/AppLayout.vue
@@ -2,7 +2,13 @@
<script >
import AppAside from "./AppAside.vue";
import AppHeader from "./AppHeader.vue"
+import Content from '@/components/core/Content.vue';
export default{
+ components:[
+ AppAside,
+ AppHeader,
+ Content
+ ],
data(){
return{
@@ -16,13 +22,14 @@
</script>
<template>
- <div class="common-layout">
+ <div class="page-container">
<el-container>
<AppAside/>
<el-container class="header-and-main">
<AppHeader/>
- <el-main class="main-content">
- <RouterView/>
+ <el-main >
+ <Content></Content>
+ <!-- <RouterView/> -->
</el-main>
</el-container>
</el-container>
@@ -34,15 +41,17 @@
.header-and-main {
flex-direction: column;
height: 100vh;
+ // min-width: 1445px;
+ min-width: 1475px;
}
-// 鍨傜洿鏂瑰悜婧㈠嚭鍖哄煙绂佹婊氬姩
+/* // 鍨傜洿鏂瑰悜婧㈠嚭鍖哄煙绂佹婊氬姩 */
.el-main {
background-color: #f4f4f5;
padding: 0;
- // overflow-y: hidden;
}
* {
font-family: 'KaiGenGothicSC-Light';
}
+
</style>
--
Gitblit v1.9.3