From 2dc6e9365073bfdabb5964f997980d260e5dc37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 8 Jun 2022 14:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/css/foamBox/style.css    | 20 +++++++++++++++----
 .../resources/static/js/tankShell/device.js   | 10 +++++-----
 .../resources/templates/foamBox/index.html    |  4 ++--
 .../resources/templates/tankShell/device.html |  2 ++
 .../classes/static/css/foamBox/style.css      | 20 +++++++++++++++----
 .../classes/static/js/tankShell/device.js     | 10 +++++-----
 .../classes/templates/foamBox/index.html      |  4 ++--
 .../classes/templates/tankShell/device.html   |  2 ++
 8 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css
index 50aaacf..6b81da4 100644
--- a/productionboard/src/main/resources/static/css/foamBox/style.css
+++ b/productionboard/src/main/resources/static/css/foamBox/style.css
@@ -32,6 +32,14 @@ body {
     left: 59%;
 }
 
+.foamingLineRunStatus {
+    position: absolute;
+    width: 40%;
+    height: 27%;
+    top: 10.5%;
+    left: 30.1%;
+}
+
 .inventoryStatistics {
     border: 0px solid red;
     position: absolute;
@@ -86,19 +94,23 @@ body {
     color: white;
     font-size: 12px;
 }
-.temperatureOne{
+
+.temperatureOne {
     width: 100%;
     height: 100%;
 }
-.temperatureTwo{
+
+.temperatureTwo {
     width: 100%;
     height: 100%;
 }
-.temperatureThree{
+
+.temperatureThree {
     width: 100%;
     height: 100%;
 }
-.temperatureFour{
+
+.temperatureFour {
     width: 100%;
     height: 100%;
 }
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index da0de5f..9a9bd7e 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -1,5 +1,5 @@
 $(() => {
-    
+
     //设备OEE统计
     OEEStatistics(null, document.getElementById("OEEStatistics"));
 
@@ -17,7 +17,7 @@ $(() => {
     $.getJSON('/tankShell/getInventoryStatistics', function (result) {
         energyConsumption(result, document.getElementById("energyConsumption"));
     });
-    
+
     //生产计划
     $.ajax({
         url: '/storage/getProductionPlan',
@@ -32,7 +32,7 @@ $(() => {
                 val[3] = '2021.01.01 10:00:00'
                 delete val[4]
             });
-            Res.header = ['设备名称', '参数名称', '当前值', '时间', ]
+            Res.header = ['设备名称', '参数名称', '当前值', '时间',]
             dynamicTable({
                 el: '#productionPlan',
                 rowNum: 5,
@@ -45,7 +45,7 @@ $(() => {
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',
                 evenRowBGC: 'rgba(6,25,57,0.2)',
-                colWidth: ['100%', '100%', '40%', '160%', ]
+                colWidth: ['100%', '100%', '40%', '160%',]
             });
         },
         error: function (e) {
@@ -70,7 +70,7 @@ $(() => {
 const dataInformationFunction = (statusArray) => {
     let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
             <tr style="width: 100%; height: 50%;">
-                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;"><i ${statusArray[0] == 0 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${statusArray[0] == 0 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
                 <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
             </tr>
             <tr style="width: 100%; height: 50%;">
diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html
index 8b90582..cdb8983 100644
--- a/productionboard/src/main/resources/templates/foamBox/index.html
+++ b/productionboard/src/main/resources/templates/foamBox/index.html
@@ -30,7 +30,7 @@
     <div class="foamingParameters" id="foamingParameters"></div>
 
     <!--设备运行状态-->
-    <!--<div class="foamingLineRunStatus">
+    <div class="foamingLineRunStatus">
         <table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
                 <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
@@ -41,7 +41,7 @@
                 <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
             </tr>
         </table>
-    </div>-->
+    </div>
 
     <!-- 轮播 -->
     <div class="swiperModule">
diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html
index 5e75a67..53a2f65 100644
--- a/productionboard/src/main/resources/templates/tankShell/device.html
+++ b/productionboard/src/main/resources/templates/tankShell/device.html
@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>箱壳成型数据监控平台</title>
     <link rel="stylesheet" href="../../../css/tankShell/device.css">
+    <link rel="stylesheet" href="../../../css/common/fontawesome-all.min.css">
+    <script src="../../../js/common/fontawesome-all.min.js"></script>
     <script src="../../../js/common/jquery.min.js"></script>
     <script src="../../../js/common/echarts.min.js"></script>
     <script src="../../../js/common/update-split-blocks.js"></script>
diff --git a/productionboard/target/classes/static/css/foamBox/style.css b/productionboard/target/classes/static/css/foamBox/style.css
index 50aaacf..6b81da4 100644
--- a/productionboard/target/classes/static/css/foamBox/style.css
+++ b/productionboard/target/classes/static/css/foamBox/style.css
@@ -32,6 +32,14 @@ body {
     left: 59%;
 }
 
+.foamingLineRunStatus {
+    position: absolute;
+    width: 40%;
+    height: 27%;
+    top: 10.5%;
+    left: 30.1%;
+}
+
 .inventoryStatistics {
     border: 0px solid red;
     position: absolute;
@@ -86,19 +94,23 @@ body {
     color: white;
     font-size: 12px;
 }
-.temperatureOne{
+
+.temperatureOne {
     width: 100%;
     height: 100%;
 }
-.temperatureTwo{
+
+.temperatureTwo {
     width: 100%;
     height: 100%;
 }
-.temperatureThree{
+
+.temperatureThree {
     width: 100%;
     height: 100%;
 }
-.temperatureFour{
+
+.temperatureFour {
     width: 100%;
     height: 100%;
 }
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index da0de5f..9a9bd7e 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -1,5 +1,5 @@
 $(() => {
-    
+
     //设备OEE统计
     OEEStatistics(null, document.getElementById("OEEStatistics"));
 
@@ -17,7 +17,7 @@ $(() => {
     $.getJSON('/tankShell/getInventoryStatistics', function (result) {
         energyConsumption(result, document.getElementById("energyConsumption"));
     });
-    
+
     //生产计划
     $.ajax({
         url: '/storage/getProductionPlan',
@@ -32,7 +32,7 @@ $(() => {
                 val[3] = '2021.01.01 10:00:00'
                 delete val[4]
             });
-            Res.header = ['设备名称', '参数名称', '当前值', '时间', ]
+            Res.header = ['设备名称', '参数名称', '当前值', '时间',]
             dynamicTable({
                 el: '#productionPlan',
                 rowNum: 5,
@@ -45,7 +45,7 @@ $(() => {
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',
                 evenRowBGC: 'rgba(6,25,57,0.2)',
-                colWidth: ['100%', '100%', '40%', '160%', ]
+                colWidth: ['100%', '100%', '40%', '160%',]
             });
         },
         error: function (e) {
@@ -70,7 +70,7 @@ $(() => {
 const dataInformationFunction = (statusArray) => {
     let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
             <tr style="width: 100%; height: 50%;">
-                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;"><i ${statusArray[0] == 0 ? 'style="color:green;"' : 'style="color: red;"'}  class="fa-regular ${statusArray[0] == 0 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
                 <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
             </tr>
             <tr style="width: 100%; height: 50%;">
diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html
index 8b90582..cdb8983 100644
--- a/productionboard/target/classes/templates/foamBox/index.html
+++ b/productionboard/target/classes/templates/foamBox/index.html
@@ -30,7 +30,7 @@
     <div class="foamingParameters" id="foamingParameters"></div>
 
     <!--设备运行状态-->
-    <!--<div class="foamingLineRunStatus">
+    <div class="foamingLineRunStatus">
         <table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
                 <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
@@ -41,7 +41,7 @@
                 <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
             </tr>
         </table>
-    </div>-->
+    </div>
 
     <!-- 轮播 -->
     <div class="swiperModule">
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html
index 5e75a67..53a2f65 100644
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>箱壳成型数据监控平台</title>
     <link rel="stylesheet" href="../../../css/tankShell/device.css">
+    <link rel="stylesheet" href="../../../css/common/fontawesome-all.min.css">
+    <script src="../../../js/common/fontawesome-all.min.js"></script>
     <script src="../../../js/common/jquery.min.js"></script>
     <script src="../../../js/common/echarts.min.js"></script>
     <script src="../../../js/common/update-split-blocks.js"></script>