From bbd9c1efa3cd88a2095f52668523295902686027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 19 Jul 2024 10:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 haiwei-admin/src/main/resources/static/board/board.css      | 2 +-
 haiwei-admin/src/main/resources/static/board/board.js       | 4 +++-
 haiwei-admin/src/main/resources/static/board/board3.js      | 3 ++-
 haiwei-admin/src/main/resources/templates/board/board1.html | 4 ++--
 haiwei-admin/src/main/resources/templates/board/board3.html | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/haiwei-admin/src/main/resources/static/board/board.css b/haiwei-admin/src/main/resources/static/board/board.css
index 89f8190..fb6492d 100644
--- a/haiwei-admin/src/main/resources/static/board/board.css
+++ b/haiwei-admin/src/main/resources/static/board/board.css
@@ -60,7 +60,7 @@ body {
     width: 57vw;
     height: 31vw;
     transform: translate(-50%, -50%);
-    z-index: 2000;
+    /*z-index: 2000;*/
 }
 
 .winDiv {
diff --git a/haiwei-admin/src/main/resources/static/board/board.js b/haiwei-admin/src/main/resources/static/board/board.js
index eb0f55f..8d29e9c 100644
--- a/haiwei-admin/src/main/resources/static/board/board.js
+++ b/haiwei-admin/src/main/resources/static/board/board.js
@@ -25,6 +25,7 @@ $(() => {
         '温度': ' ℃',
         '压力': ' MPa',
       }
+
       let data = e.data
       let arrNum = Array.from(new Set([...e.data.map(e => e.order_by)]))
       let arr = arrNum.map(e => {
@@ -40,9 +41,10 @@ $(() => {
         })
         return obj
       })
+      $("#centerInfoDiv").empty()
       arr.forEach(val => {
         let html = `
-      <div class="centerInfo" style="top: ${val.top};left:${val.left};z-index:2000">
+      <div class="centerInfo" style="top: ${val.top};left:${val.left};">
         <div class="win" style="display: none">
           <div class="title">${val.name}</div>
           <div class="span1">${val.data1}: ${val.num1 || 0}${val.unit1}</div>
diff --git a/haiwei-admin/src/main/resources/static/board/board3.js b/haiwei-admin/src/main/resources/static/board/board3.js
index 01d76c5..5125667 100644
--- a/haiwei-admin/src/main/resources/static/board/board3.js
+++ b/haiwei-admin/src/main/resources/static/board/board3.js
@@ -40,6 +40,7 @@ $(() => {
         })
         return obj
       })
+      $("#centerInfoDiv").empty()
       arr.forEach(val => {
         let html = `
       <div class="centerInfo" style="top: ${val.top};left:${val.left};z-index:2000">
@@ -94,7 +95,7 @@ $(() => {
 
   setInterval(() => {
     request()
-  }, 1000 * 60)
+  }, 1000 *60)
 })
 
 let chart = null
diff --git a/haiwei-admin/src/main/resources/templates/board/board1.html b/haiwei-admin/src/main/resources/templates/board/board1.html
index a84827a..8a8b8d1 100644
--- a/haiwei-admin/src/main/resources/templates/board/board1.html
+++ b/haiwei-admin/src/main/resources/templates/board/board1.html
@@ -211,10 +211,10 @@
     </div>
   </div>
 
+  <div id="statusD">
+  </div>
   <div id="centerInfoDiv" class="centerInfoDiv" >
 
-  </div>
-  <div id="statusD">
   </div>
 
   <div class="eqModal" id="eqModal">
diff --git a/haiwei-admin/src/main/resources/templates/board/board3.html b/haiwei-admin/src/main/resources/templates/board/board3.html
index 4d52829..15aa91b 100644
--- a/haiwei-admin/src/main/resources/templates/board/board3.html
+++ b/haiwei-admin/src/main/resources/templates/board/board3.html
@@ -202,11 +202,11 @@
 
   <div class="centerImg">
 
+  </div>
+  <div id="statusD">
   </div>
   <div id="centerInfoDiv" class="centerInfoDiv" >
 
-  </div>
-  <div id="statusD">
   </div>
 
   <div id="rightInfo" style="display: none">