From 729f1c526d3fb35c22f24f7516a9c62fc115b104 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 27 六月 2024 15:37:14 +0800
Subject: [PATCH] fix: 修改应用场景
---
src/layout/component/main.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index b42ba3d..8026e4e 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -1,12 +1,19 @@
<template>
- <el-main class="layout-main" :style="isFixedHeader ? `height: calc(100% - ${setMainHeight})` : `minHeight: calc(100% - ${setMainHeight})`">
+ <el-main
+ class="layout-main"
+ :style="isFixedHeader ? `height: calc(100% - ${setMainHeight})` : `minHeight: calc(100% - ${setMainHeight})`"
+ >
<el-scrollbar
ref="layoutMainScrollbarRef"
class="layout-main-scroll layout-backtop-header-fixed"
- wrap-class="layout-main-scroll"
- view-class="layout-main-scroll h100"
+ wrap-class="layout-main-scroll flex"
+ view-class="layout-main-scroll bg-[#1c1e1d] flex h100 w-full"
>
- <LayoutParentView />
+ <SideBar />
+ <div class="flex-auto flex-col flex right-container">
+ <waterHeader class="flex-0" />
+ <LayoutParentView class="flex-auto" />
+ </div>
<!-- <LayoutFooter v-if="isFooter" /> -->
</el-scrollbar>
<el-backtop :target="setBacktopClass" />
@@ -14,9 +21,11 @@
</template>
<script setup lang="ts" name="layoutMain">
-import { defineAsyncComponent, onMounted, computed, ref } from 'vue';
-import { useRoute } from 'vue-router';
import { storeToRefs } from 'pinia';
+import { computed, defineAsyncComponent, onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import waterHeader from './header/Header.vue';
+import SideBar from './sidebar/Sidebar.vue';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import { useThemeConfig } from '/@/stores/themeConfig';
import { NextLoading } from '/@/utils/loading';
@@ -63,3 +72,18 @@
layoutMainScrollbarRef,
});
</script>
+
+<style scoped lang="scss">
+.right-container {
+ width: 100vw;
+ // margin: 0;
+ padding: 0;
+ overflow: hidden;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ background-color: #1c1e1d;
+ font-family: 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+ margin: 6px;
+ border-radius: 10px;
+}
+</style>
--
Gitblit v1.9.3