From 37ac308d7d592a3ee32bb90bf9fc23d8360935ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 18 Oct 2022 17:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=B3=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/scada/NorthFoamerMesPlan.html   | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
index 16f2322..dd6380d 100644
--- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
+++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
@@ -16,6 +16,12 @@
 
 </head>
 <style>
+    .top-mid-Text-status{
+        position: absolute;
+        top:14%;
+        width:0;
+        height:0;
+    }
     #top-left {
         border: 0px solid red;
         position: absolute;
@@ -304,32 +310,33 @@
     </div>
 
     <!--当日计划-->
-    <div class="top-mid-Text" style="position: absolute;top:73%;left: 7%;">
-        <img alt="运行状态" id="status-a" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-    </div>
 
-    <!--当前计划-->
-    <div class="top-mid-Text" style="position: absolute;top:73%;left:23%">
-        <img alt="运行状态" id="status-b" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-    </div>
+</div>
 
-    <div class="top-mid-Text" style="position: absolute;top:73%;left:39%">
-        <img alt="运行状态" id="status-c" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-    </div>
+<!--运行状态-->
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left: 33%;">
+    <img alt="运行状态" id="status-a" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+</div>
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:39%">
+    <img alt="运行状态" id="status-b" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+</div>
 
-    <div class="top-mid-Text" style="position: absolute;top:73%;left:55%">
-        <img alt="运行状态" id="status-d" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-    </div>
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:44.5%">
+    <img alt="运行状态" id="status-c" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+</div>
 
-    <!--运行状态-->
-    <div class="top-mid-Text" style="position: absolute;top:73%;left:77%">
-        <img alt="运行状态" id="status-sys1" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-        <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
-    </div>
-    <div class="top-mid-Text" style="position: absolute;top:73%;left:95%">
-        <img alt="运行状态" id="status-sys2" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}"/>
-        <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
-    </div>
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:50.5%">
+    <img alt="运行状态" id="status-d" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+</div>
+
+<!--运行状态-->
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:59.5%">
+    <img alt="运行状态" id="status-sys1" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
+</div>
+<div class="top-mid-Text-status" style="transform: translate(-50%,-50%);left:67%">
+    <img alt="运行状态" id="status-sys2" src="../../static/img/runImg.png" th:src="@{/img/runImg.png}" style="width:2vw"/>
+    <!--<img alt="运行状态" src="../../static/img/stopImg.png" th:src="@{/img/stopImg.png}"/>-->
 </div>
 
 <!--发泡参数-->
@@ -534,6 +541,7 @@
         })
 
         autoUpdate('/system/FoamerMes/getInventoryInfo', INTERVAL, data => {
+            console.log(data['xAxisInfo'].map(value => value.split(",").find(value => /^[Ss][Cc]/.test(value)) ?? value))
             repertoryChart.setOption({
                 xAxis: {
                     data: data['xAxisInfo'],
@@ -810,12 +818,12 @@
             {
                 name: '数量',
                 type: 'pie',
-                radius: ['40%', '55%'],
+                radius: ['55%', '70%'],
                 label: {
                     show: true,
                     formatter: '{b}\n{d}%',
                     textStyle: {
-                        fontSize: '16px',
+                        fontSize: '10px',
                     },
                     color: '#ddd'
                 },