From 773e59cdc3571ad0815f286bb8895a3f27a28961 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 01 三月 2024 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~xiaohui/daoAnOffice
---
src/views/HomeView.vue | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index d225de6..842401e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,21 +1,26 @@
-<script setup lang="ts">
+<script setup>
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 Setting from "./setting.vue";
import { useSettingStore } from "@/stores/index";
-import { storeToRefs } from 'pinia';
+import { storeToRefs } from "pinia";
+import MessageContent from "@/components/Plugins/MessageContent";
+
+import {mapState} from '@/stores/map.js';
+
+// import Chartgd from "@/views/daoAnOffice/chartgd.vue";
const settingStore = useSettingStore();
-const {isScale} =storeToRefs(settingStore)
+const { isScale } = storeToRefs(settingStore);
const wrapperStyle = {};
</script>
<template>
<scale-screen
- width="1920"
+ width="3840"
height="1080"
:delay="500"
:fullScreen="false"
@@ -27,20 +32,40 @@
:autoScale="isScale"
>
<div class="content_wrap">
+ <!-- <chartgd class="gddt" v-show="!mapState"></chartgd> -->
<Headers />
<RouterView />
+ <MessageContent />
+ <div class="d-bottom">
+ </div>
</div>
</scale-screen>
- <Setting/>
+ <Setting />
</template>
<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;
+ //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;
}
+.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