From 721f6ec69e796fd5c9807eaf68ec25df2bcf4e66 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 29 二月 2024 11:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/HomeView.vue |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index fe23153..6a2049e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,14 +1,71 @@
 <script setup lang="ts">
+import { ref } from "vue";
 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";
+import Chartgd from "@/views/daoAnOffice/chartgd.vue";
 
+const settingStore = useSettingStore();
+const { isScale } = storeToRefs(settingStore);
+const wrapperStyle = {};
+const dtFig=ref(0)
+const handlechan=()=>{
+
+}
 </script>
 
 <template>
-    <div>
-    <RouterView />
-
+  <scale-screen
+    width="3840"
+    height="1080"
+    :delay="500"
+    :fullScreen="false"
+    :boxStyle="{
+      background: '#03050C',
+      overflow: isScale ? 'hidden' : 'auto',
+    }"
+    :wrapperStyle="wrapperStyle"
+    :autoScale="isScale"
+  >
+    <div class="content_wrap">
+      <chartgd @changeDt="handlechan"  v-if="dtFig ==0" class="gddt"></chartgd>
+      <Headers />
+      <RouterView />
+      <MessageContent />
+      <div class="d-bottom">
+      </div>
     </div>
+  </scale-screen>
+  <Setting />
 </template>
-<style  lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+.gddt{
+  position: absolute;
+  z-index: 0;
+  width: 3840px;
+  height: 1080px;
+}
+.content_wrap {
+  width: 100%;
+  height: 100%;
+  //padding: 16px 16px 16px 16px;
+  box-sizing: border-box;
+  background-image: url("@/assets/img/pageBg1.png");
+  background-size: cover;
+  background-position: center center;
+}
+.d-bottom{
+  position: relative;
+  //width: 120px;
+  bottom: 140px;
+  height: 80px;
+  background-image: url("@/assets/img/bottombg.png");
+  background-size: cover;
+  background-position: center center;
+  margin-bottom: 4px;
+}
+</style>

--
Gitblit v1.8.0