From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交
---
platform/src/layouts/AppLayout.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/platform/src/layouts/AppLayout.vue b/platform/src/layouts/AppLayout.vue
index 96464f1..43e3677 100644
--- a/platform/src/layouts/AppLayout.vue
+++ b/platform/src/layouts/AppLayout.vue
@@ -11,17 +11,11 @@
<AppHeader/>
</header>
<div style="height:10px;"></div>
- <main>
+ <main ref="containerS">
<transition name="fade">
-<<<<<<< HEAD
<!-- <keep-alive>-->
<router-view></router-view>
<!-- </keep-alive>-->
-=======
- <keep-alive>
- <router-view></router-view>
- </keep-alive>
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</transition>
</main>
</el-main>
@@ -35,19 +29,28 @@
import Header from '@/components/common/Header'
import CommonHeader from '@/components/common/CommonHeader'
import Menu from '@/components/common/Menu'
+import Watermark from "@/utils/waterMark";
export default {
name: 'DefaultLayout',
components: { AppHeader: Header, Menu, CommonHeader },
data() {
return {
- isFinishData: false
+ isFinishData: false,
+ orgBackground: ''
}
},
computed: {
...mapState(['menuData', 'userInfo'])
},
- methods: {
+ mounted() {
+ // 浼佷笟绔敤鎴疯缃按鍗�
+ if (this.userInfo.type === 1) {
+ Watermark.set(this.userInfo.company.name, this.$refs.containerS);
+ }
+ },
+
+ methods: {
},
}
@@ -105,6 +108,7 @@
}
& > main {
height: 100%;
+ box-sizing: border-box;
overflow-y: auto;
}
}
--
Gitblit v1.9.3