From 5d152dbd84722beeec5b2d5977333bd1e2cc6809 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 28 二月 2024 16:46:29 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~xiaohui/daoAnOffice
---
src/views/HomeView.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 90a0e71..2b7eb63 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -3,36 +3,44 @@
import { RouterView } from "vue-router";
import ScaleScreen from "@/components/scale-screen";
import Headers from "./header.vue";
+import Setting from "./setting.vue";
+import { useSettingStore } from "@/stores/index";
+import { storeToRefs } from "pinia";
+import MessageContent from "@/components/Plugins/MessageContent";
+
+const settingStore = useSettingStore();
+const { isScale } = storeToRefs(settingStore);
const wrapperStyle = {};
-const autoScale = ref(false);
</script>
<template>
<scale-screen
- width="1920"
+ width="3840"
height="1080"
:delay="500"
:fullScreen="false"
:boxStyle="{
background: '#03050C',
- overflow: autoScale ? 'hidden' : 'auto',
+ overflow: isScale ? 'hidden' : 'auto',
}"
:wrapperStyle="wrapperStyle"
- :autoScale="autoScale"
+ :autoScale="isScale"
>
<div class="content_wrap">
<Headers />
<RouterView />
+ <MessageContent />
</div>
</scale-screen>
+ <Setting />
</template>
<style lang="scss" scoped>
.content_wrap {
width: 100%;
height: 100%;
- padding: 16px 16px 16px 16px;
+ //padding: 16px 16px 16px 16px;
box-sizing: border-box;
- background-image: url("@/assets/img/pageBg.png");
+ background-image: url("@/assets/img/pageBg1.png");
background-size: cover;
background-position: center center;
}
--
Gitblit v1.8.0