From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/layout/index.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 44b4ff0..e9f8096 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -1,44 +1,48 @@
<template>
<el-container id="body-wrapper">
<!-- 渚ц竟瀵艰埅鏍� -->
- <SiderBar/>
- <el-container>
+ <Menu />
+ <el-container class="content">
<!-- 澶撮儴 -->
- <Header/>
+ <Header />
<!-- 鍐呭鍖哄煙 -->
- <Main/>
+ <Main />
</el-container>
</el-container>
</template>
<script>
import Main from "./components/Main";
-import NavBar from "./components/NavBar";
-import SiderBar from "./components/SiderBar";
+import Menu from "./components/Menu";
import Header from "./components/Header";
-
export default {
name: "layout",
components: {
- NavBar,
- SiderBar,
+ Menu,
Main,
- Header
+ Header,
},
};
</script>
<style lang="scss" scoped>
-#body-wrapper{
+#body-wrapper {
width: 100vw;
height: 100vh;
- display: flex;
- .el-container{
- flex-direction: column;
- }
}
+
+.my-el-content {
+ margin-top: 60px;
+}
+
+.content{
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
.el-main {
- background-color: #f0f2f5;
+ background-color: #fff;
color: #333;
text-align: center;
line-height: 160px;
--
Gitblit v1.8.0