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 = `
${res.deviceStatus == 1 ? `正常` : `异常`} |
- ${test(res.devicePower,1000)} kW |
+ ${res.devicePower} kW |
- ${test(res.deviceEnergy,100)}kW·h |
+ ${res.deviceEnergy}kW·h |
${res.count} |
`;
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 = `
${res.deviceStatus == 1 ? `正常` : `异常`} |
- ${test(res.devicePower,1000)} kW |
+ ${res.devicePower} kW |
- ${test(res.deviceEnergy,100)}kW·h |
+ ${res.deviceEnergy}kW·h |
${res.count} |
`;