From 9b3779555c8ac9734af026ad48b8fd2464f4a6d0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Fri, 26 Jan 2024 14:41:37 +0800
Subject: [PATCH] update 3d

---
 src/MainPage.vue               |  6 +++---
 src/pages/3D.vue               | 10 +++++-----
 src/pages/AlertListPage.vue    | 10 ++++++++++
 src/pages/AnnouncementPage.vue |  2 +-
 src/pages/DataPage.vue         | 14 +++++++++++++-
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/MainPage.vue b/src/MainPage.vue
index 1fac22e..ab51f0b 100644
--- a/src/MainPage.vue
+++ b/src/MainPage.vue
@@ -96,9 +96,9 @@ function resetScale(elm) {
     <div v-else class="pages-wrapper">
       <NavMenu @change="handlePageChange" :value="currentPage" />
       <TriplePage v-if="currentPage === '3d'" :line="pathMap[path] ?? '1'" />
-      <DataPage v-if="currentPage === 'data'" />
-      <AlertListPage v-if="currentPage === 'alert'" />
-      <RealtimePage v-if="currentPage === 'realtime'" />
+      <DataPage v-if="currentPage === 'data'" :line="pathMap[path] ?? '1'" />
+      <AlertListPage v-if="currentPage === 'alert'" :line="pathMap[path] ?? '1'" />
+      <RealtimePage v-if="currentPage === 'realtime'" :line="pathMap[path] ?? '1'" />
     </div>
   </div>
 </template>
diff --git a/src/pages/3D.vue b/src/pages/3D.vue
index 9992bf3..9461692 100644
--- a/src/pages/3D.vue
+++ b/src/pages/3D.vue
@@ -11,6 +11,10 @@ const props = defineProps({
     type: Number,
     default: 1,
   },
+  fixed: {
+    type: Boolean,
+    default: false
+  }
 });
 const eqStatus = computed(() => settings.eqStatus);
 
@@ -69,7 +73,7 @@ watch(() => settings.fullscreen, val => {
 </script>
 
 <template>
-  <div class="triple-page" ref="part3d" :class="['line-' + line]">
+  <div class="triple-page" ref="part3d" :class="['line-' + line]" :style="{ position: fixed ? 'fixed' : ''}">
     <div class="absolute-full info-1" v-if="eqStatus && line == '1'">
       <div class="info">
         <h1>
@@ -581,13 +585,9 @@ watch(() => settings.fullscreen, val => {
 
 <style scoped>
 .triple-page {
-  /* background: #ccc1; */
   background-size: 1920px 1080px;
-  /* background-size: 100% 100%; */
   background-position: 0 -100px;
   background-repeat: no-repeat;
-  /* flex: 1;
-  position: relative; */
   position: absolute;
   top: 0;
   left: 0;
diff --git a/src/pages/AlertListPage.vue b/src/pages/AlertListPage.vue
index cdffea8..1cb70aa 100644
--- a/src/pages/AlertListPage.vue
+++ b/src/pages/AlertListPage.vue
@@ -3,7 +3,14 @@
 import { ref } from "vue";
 import { useWsStore } from "../store";
 import Container from "../components/Base/Container.vue";
+import ThreeD from './3D.vue'
 
+const props = defineProps({
+  line: {
+    type: Number,
+    default: 1,
+  },
+});
 const store = useWsStore();
 const alarmList = ref((store.data1.alarmArrList || []).map((item, index) => ({
   id: item.id,
@@ -31,6 +38,9 @@ store.$subscribe((mutation, state) => {
 
 <template>
   <div class="alert-list-page">
+    <div style="position: absolute; top: 0; left: -279px; width: calc(100% + 279px); height: 100%;">
+      <ThreeD :line="line ?? '1'" />
+    </div>
     <Container class="alert-list" title="报警列表" icon="cube">
       <div class="alert-list__table" style="">
         <el-table class="dark-table" :data="alarmList" :show-overflow-tooltip="true" row-class-name="dark-row"
diff --git a/src/pages/AnnouncementPage.vue b/src/pages/AnnouncementPage.vue
index d70eb13..aa4f6b7 100644
--- a/src/pages/AnnouncementPage.vue
+++ b/src/pages/AnnouncementPage.vue
@@ -40,7 +40,7 @@ const handleClose = () => {
   <div class="announcement-page">
     <h1 class="announcement-title">公告栏</h1>
     <main class="announcement-content">
-      <ScrollText :vertical="true" :duration="50" :pause-on-hover="true">
+      <ScrollText :vertical="true" :duration="120" :pause-on-hover="false">
         <div v-html="vertical_content"></div>
       </ScrollText>
     </main>
diff --git a/src/pages/DataPage.vue b/src/pages/DataPage.vue
index d60e132..0009a88 100644
--- a/src/pages/DataPage.vue
+++ b/src/pages/DataPage.vue
@@ -3,10 +3,22 @@
 import HourChart from "../components/HourChart.vue";
 import TeamChartDay from "../components/TeamChartDay.vue";
 import TeamChartMonth from "../components/TeamChartMonth.vue";
+import ThreeD from './3D.vue'
+
+const props = defineProps({
+  line: {
+    type: Number,
+    default: 1,
+  },
+});
+
 </script>
 
 <template>
   <div class="data-page">
+    <div style="position: absolute; top: 0; left: -279px; width: calc(100% + 279px); height: 100%;">
+      <ThreeD :line="line ?? '1'" />
+    </div>
     <div class="data-list">
       <HourChart />
       <TeamChartDay />
@@ -41,7 +53,7 @@ import TeamChartMonth from "../components/TeamChartMonth.vue";
   justify-content: space-around;
 }
 
-:fullscreen .data-list > div {
+:fullscreen .data-list>div {
   flex: 1;
 }
 </style>