From b2ef9d6cfee367e2ba67e3d9e41ffca6c091ae61 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 6 Jan 2023 10:29:59 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=96=E6=B6=88=E8=83=BD?=
 =?UTF-8?q?=E8=80=97=E9=99=A4100=E7=B3=BB=E6=95=B0=E3=80=81=E5=8A=9F?=
 =?UTF-8?q?=E7=8E=87=E9=99=A41000=E7=B3=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 productionboard/src/main/resources/application.yml            | 4 ++--
 .../src/main/resources/static/js/aluminumLiner/index.js       | 4 ++--
 .../src/main/resources/static/js/tankShell/device.js          | 4 ++--
 productionboard/target/classes/static/js/tankShell/device.js  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/productionboard/src/main/resources/application.yml b/productionboard/src/main/resources/application.yml
index 142f6dd..bea2bcb 100644
--- a/productionboard/src/main/resources/application.yml
+++ b/productionboard/src/main/resources/application.yml
@@ -12,6 +12,6 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml
 
 server:
-  port: 6070
+  port: 6069
 
-in_id: 2
\ No newline at end of file
+in_id: 1
\ No newline at end of file
diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
index db8295f..7dac822 100644
--- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js
+++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
@@ -7,8 +7,8 @@ $(() => {
             if (result.length > 0) {
                 if(result[0].deviceEnergy > 0){
                     statusArray[0] = result[0].deviceStatus == "正常" ? "1" : "0";
-                    statusArray[1] = test(result[0].devicePower,1000);
-                    statusArray[2] = test(result[0].deviceEnergy,100);
+                    statusArray[1] = result[0].devicePower;
+                    statusArray[2] = result[0].deviceEnergy;
                     statusArray[3] = result[0].count;
                     dataInformationFunction(statusArray);
                 }
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index 805d334..a6daf47 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -84,11 +84,11 @@ 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%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'}  class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td>
-                <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${test(res.devicePower,1000)} kW</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${res.devicePower} kW</td>
             </tr>
             <tr style="width: 100%; height: 50%;">
             
-                <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${res.deviceEnergy}kW·h</td>
                 <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
             </tr>
         </table>`;
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index 805d334..a6daf47 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -84,11 +84,11 @@ 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%;"><i ${res.deviceStatus == 1 ? 'style="color:rgb(107, 253, 110);"' : 'style="color: rgb(255, 105, 106);"'}  class="fa-regular ${res.deviceStatus == 1 ? "fa-circle-check" : "fa-circle-xmark"}"></i>${res.deviceStatus == 1 ? `<span style="color:rgb(107, 253, 110);margin-left: 10px">正常</span>` : `<span style="color:rgb(255, 105, 106);margin-left: 10px">异常</span>`}</td>
-                <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${test(res.devicePower,1000)} kW</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #FFEF76;"> ${res.devicePower} kW</td>
             </tr>
             <tr style="width: 100%; height: 50%;">
             
-                <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${test(res.deviceEnergy,100)}kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #59B2F6;"> ${res.deviceEnergy}kW·h</td>
                 <td style="border:0px solid red;text-align:center;width: 50%;color: red;">${res.count}</td>
             </tr>
         </table>`;