From d129c66cbf534146c61a2113edeb792cd3fde972 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, 6 Dec 2024 09:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/index2.vue      |   4 +-
 ruoyi-ui/src/views/board/index.vue  | 100 ++++++++++++++++++++++------
 ruoyi-ui/src/views/board/index2.vue |  18 ++---
 3 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/ruoyi-ui/src/layout/index2.vue b/ruoyi-ui/src/layout/index2.vue
index d129b24..c373f48 100644
--- a/ruoyi-ui/src/layout/index2.vue
+++ b/ruoyi-ui/src/layout/index2.vue
@@ -17,12 +17,12 @@
           <div class="topNavScroll"
                style="max-height: 300px;overflow: auto;background-color: #053563;padding: 0;border: none;">
 
-            <el-dropdown-item command="index1">
+            <el-dropdown-item command="index">
                 <span style="color: #f8fefd">
                   智能巡检
                 </span>
             </el-dropdown-item>
-            <el-dropdown-item command="index">
+            <el-dropdown-item command="index1">
                 <span style="color: #f8fefd">
                   无线测温
                 </span>
diff --git a/ruoyi-ui/src/views/board/index.vue b/ruoyi-ui/src/views/board/index.vue
index 10d9800..9b80b14 100644
--- a/ruoyi-ui/src/views/board/index.vue
+++ b/ruoyi-ui/src/views/board/index.vue
@@ -125,7 +125,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0,
       },
-      scrollTableData: Array(100).fill('').map(function (i, k) {
+      scrollTableData: Array(0).fill('').map(function (i, k) {
         return {
           value1: '2222-22-22 22:22:22',
           value2: '出库出库',
@@ -171,75 +171,135 @@ export default {
       stationList: [
         {
           top: 49,
-          left: 47.3
+          left: 47.9
         },
         {
           top: 49,
-          left: 52.9
+          left: 50.6
         },
         {
           top: 49,
-          left: 58.6
+          left: 53.1
         },
         {
           top: 49,
-          left: 64.1
+          left: 55.8
         },
         {
           top: 49,
-          left: 69.8
+          left: 58.4
         },
         {
           top: 49,
-          left: 75.4
+          left: 61
         },
         {
           top: 49,
-          left: 81
+          left: 63.6
         },
         {
           top: 49,
-          left: 86.6
+          left: 66.2
         },
         {
           top: 49,
-          left: 92.2
+          left: 68.9
+        },
+        {
+          top: 49,
+          left: 71.6
+        },
+        {
+          top: 49,
+          left: 74.3
+        },
+        {
+          top: 49,
+          left: 77
+        },
+        {
+          top: 49,
+          left: 79.7
+        },
+        {
+          top: 49,
+          left: 82.4
+        },
+        {
+          top: 49,
+          left: 85.1
+        },
+        {
+          top: 49,
+          left: 87.8
+        },
+        {
+          top: 49,
+          left: 90.5
+        },
+        {
+          top: 49,
+          left: 93.2
+        },
+        {
+          top: 58.4,
+          left: 51.9
+        },
+        {
+          top: 58.4,
+          left: 54.6
+        },
+        {
+          top: 58.4,
+          left: 57.3
+        },
+        {
+          top: 58.4,
+          left: 60
+        },
+        {
+          top: 58.4,
+          left: 62.7
+        },
+        {
+          top: 58.4,
+          left: 65.4
         },
         {
           top: 58.4,
-          left: 47.3
+          left: 68.1
         },
         {
           top: 58.4,
-          left: 52.9
+          left: 70.8
         },
         {
           top: 58.4,
-          left: 58.6
+          left: 73.5
         },
         {
           top: 58.4,
-          left: 64.1
+          left: 76.2
         },
         {
           top: 58.4,
-          left: 69.8
+          left: 78.9
         },
         {
           top: 58.4,
-          left: 75.4
+          left: 81.6
         },
         {
           top: 58.4,
-          left: 81
+          left: 84.3
         },
         {
           top: 58.4,
-          left: 86.6
+          left: 87
         },
         {
           top: 58.4,
-          left: 92.2
+          left: 89.7
         },
       ]
     }
@@ -635,7 +695,7 @@ export default {
 
 .station {
   position: absolute;
-  width: 3.7%;
+  width: 1.8%;
   height: 1.9%;
   background-color: #234271;
   transform: translate(-50%, -50%);
diff --git a/ruoyi-ui/src/views/board/index2.vue b/ruoyi-ui/src/views/board/index2.vue
index f942dfd..6ba4306 100644
--- a/ruoyi-ui/src/views/board/index2.vue
+++ b/ruoyi-ui/src/views/board/index2.vue
@@ -8,9 +8,9 @@
       <div class="span" style="color: #46c9f9;top: 29%;left: 6.8%">智能巡检</div>
       <div class="span" style="color: #4befb7;top: 29%;left: 15.3%">无线测温</div>
       <div class="span" style="color: #f3de40;top: 29%;left: 23.7%">动力环境</div>
-      <div class="span1" style="color: #f3de40;top: 32%;left: 6.8%;font-weight: 700">3838</div>
-      <div class="span1" style="color: #f3de40;top: 32%;left: 15.3%;font-weight: 700">3838</div>
-      <div class="span1" style="color: #f3de40;top: 32%;left: 23.7%;font-weight: 700">3838</div>
+      <div class="span1" style="color: #f3de40;top: 32%;left: 6.8%;font-weight: 700">1</div>
+      <div class="span1" style="color: #f3de40;top: 32%;left: 15.3%;font-weight: 700">30</div>
+      <div class="span1" style="color: #f3de40;top: 32%;left: 23.7%;font-weight: 700">15</div>
       <div class="span2" style="color: #46c9f9;top: 49.7%;left: 9.6%"><span
         style="font-weight: 600;font-size:1.3vw;">13</span>℃
       </div>
@@ -22,7 +22,9 @@
       <div class="span" style="color: #eee;top: 62.7%;left: 5.9%;font-size: 1.1vw">照度</div>
       <div class="span" style="font-size: 0.6vw;color: #eee;top: 64.5%;left: 13%">410-1烟感</div>
       <div class="span" style="font-size: 0.6vw;color: #eee;top: 64.5%;left:17%">410-2烟感</div>
-      <div class="span" style="font-size: 0.6vw;color: #eee;top: 64.5%;left: 24.8%">水浸</div>
+      <div class="span" style="font-size: 0.6vw;color: #eee;top: 64.5%;left: 24.8%">噪声</div>
+      <div class="span2" style="color: #46c9f9;top:61.8%;left:24.8%;font-size: 0.9vw">40db
+      </div>
 
       <div class="span3" style="color: #3597df;top: 30%;left: 50%">设备监控</div>
       <div class="span" style="color: #3597df;top: 31.2%;    left: 38.7%;">温度</div>
@@ -34,7 +36,7 @@
 
       <div class="icon" style="top:61.8%;left:13%"></div>
       <div class="icon" style="top:61.8%;left:17%"></div>
-      <div class="icon1" style="top:61.8%;left:24.8%"></div>
+<!--      <div class="icon1" style="top:61.8%;left:24.8%"></div>-->
       <Chart ref="chart1" class="chart1"></Chart>
       <Chart ref="chart2" class="chart2"></Chart>
 
@@ -108,7 +110,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0,
       },
-      scrollTableData: Array(100).fill('').map(function (i, k) {
+      scrollTableData: Array(0).fill('').map(function (i, k) {
         return {
           value1: '2222-22-22 22:22:22',
           value2: '设备1',
@@ -277,7 +279,7 @@ export default {
       },
       xAxis: {
         type: 'category',
-        data: Array(7).fill(0).map((i, k) => {
+        data: Array(5).fill(0).map((i, k) => {
           return '12-0' + (k + 1)
         }),
         axisLabel: {
@@ -358,7 +360,7 @@ export default {
           tooltip: {
             // show: false,
           },
-          data: Array(7).fill(0).map(e => {
+          data: Array(5).fill(0).map(e => {
             return 0 + parseFloat((Math.random() * 5).toFixed(0))
           }),
         }