From 453719aadd54459922b95ab880519a0b5324c3fb Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 11 十一月 2024 15:41:19 +0800
Subject: [PATCH] 前往WI水务 取消
---
src/layout/component/main.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index 6f1a255..b2bb9ce 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -5,36 +5,45 @@
>
<el-scrollbar
ref="layoutMainScrollbarRef"
- class="layout-main-scroll layout-backtop-header-fixed"
+ class="layout-main-scroll layout-backtop-header-fixed"
wrap-class="layout-main-scroll flex"
view-class="layout-main-scroll bg-[#1c1e1d] flex h100 w-full"
>
- <SideBar />
- <div class="flex-auto flex-col flex right-container">
- <waterHeader class="flex-0"/>
+ <SideBar v-if="!isSharePage" />
+ <div
+ class="flex-auto flex-col flex right-container"
+ :class="{
+ 'm-[6px]': !isSharePage,
+ 'rounded-[10px]': !isSharePage,
+ 'bg-[#1c1e1d]': !isSharePage,
+ 'bg-[#f7f8fa]': isSharePage,
+ }"
+ >
+ <Header v-if="!isSharePage" class="flex-0" />
+ <ShareHeader v-else class="flex-0"></ShareHeader>
<LayoutParentView class="flex-auto" />
</div>
- <!-- <LayoutFooter v-if="isFooter" /> -->
</el-scrollbar>
<el-backtop :target="setBacktopClass" />
</el-main>
</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 Header from './header/Header.vue';
+import ShareHeader from './header/ShareHeader.vue';
+
+import SideBar from './sidebar/Sidebar.vue';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import { useThemeConfig } from '/@/stores/themeConfig';
import { NextLoading } from '/@/utils/loading';
-import SideBar from './SideBar.vue';
-import WIHeader from './WIHeader.vue';
-import waterHeader from '/@/views/project/ch/home/component/waterRight/header.vue';
+import { isSharePage } from '/@/stores/chatRoom';
// 寮曞叆缁勪欢
const LayoutParentView = defineAsyncComponent(() => import('/@/layout/routerView/parent.vue'));
const LayoutFooter = defineAsyncComponent(() => import('/@/layout/footer/index.vue'));
-
// 瀹氫箟鍙橀噺鍐呭
const layoutMainScrollbarRef = ref();
const route = useRoute();
@@ -75,17 +84,16 @@
</script>
<style scoped lang="scss">
-.right-container{
+.right-container {
width: 100vw;
// margin: 0;
padding: 0;
overflow: hidden;
-webkit-box-sizing: border-box;
box-sizing: border-box;
- background-color: #1c1e1d;
+ // background-color: #1c1e1d;
font-family: 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
- margin: 6px;
- border-radius: 10px;
-
+ // margin: 6px;
+ // border-radius: 10px;
}
</style>
--
Gitblit v1.9.3