diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
index 3744a9e..2dbb725 100644
Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar differ
diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
index 609b935..5fcb0d2 100644
Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original differ
diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
index ba3ad1f..b11bfc0 100644
--- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js
+++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
@@ -10,7 +10,7 @@ $(() => {
}
dataInformationFunction(statusArray);
});
- $.getJSON('/aluminumLiner/getEnergyProductStatistics', function (result) {
+ $.getJSON('/aluminumLiner/getRunParameters', function (result) {
synthetic(result)
});
diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js
index 4fd7f7e..034e361 100644
--- a/productionboard/src/main/resources/static/js/common/synthetic.js
+++ b/productionboard/src/main/resources/static/js/common/synthetic.js
@@ -10,10 +10,10 @@ const dataInformationFunction = (statusArray) => {
${statusArray[3]} |
`;
-
$("#dataInformation").append(info);
}
const synthetic = (statusArray) => {
+ console.log(statusArray);
let info = `
${statusArray[0] || 0} |
@@ -39,6 +39,5 @@ const synthetic = (statusArray) => {
${statusArray[8] || 0}
${statusArray[9] || 0}
`;
-
$("#synthetic").append(info);
}
diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class
index 46686f8..a1458b2 100644
Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class differ
diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class
index ad376b0..e361920 100644
Binary files a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class and b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class differ
diff --git a/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class
index 8a4c5c1..3843cdc 100644
Binary files a/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class and b/productionboard/target/classes/com/productionboard/service/IAluminumDeviceInfoService.class differ
diff --git a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class
index 20e9d1e..29d86e9 100644
Binary files a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class differ
diff --git a/productionboard/target/classes/static/css/aluminumLiner/style.css b/productionboard/target/classes/static/css/aluminumLiner/style.css
index e32079b..1373038 100644
--- a/productionboard/target/classes/static/css/aluminumLiner/style.css
+++ b/productionboard/target/classes/static/css/aluminumLiner/style.css
@@ -42,10 +42,10 @@ body {
.loss {
border: 0px solid red;
position: absolute;
- width: 25%;
+ width: 28%;
height: 25%;
top: 41%;
- left: 72%;
+ left: 71%;
}
diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css
index 0e93d43..9cc25d6 100644
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@@ -99,10 +99,10 @@ body {
.loss {
border: 0px solid red;
position: absolute;
- width: 25%;
+ width: 28%;
height: 25%;
top: 41%;
- left: 72%;
+ left: 71%;
}
.productionPlan {
diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js
index ba3ad1f..b11bfc0 100644
--- a/productionboard/target/classes/static/js/aluminumLiner/index.js
+++ b/productionboard/target/classes/static/js/aluminumLiner/index.js
@@ -10,7 +10,7 @@ $(() => {
}
dataInformationFunction(statusArray);
});
- $.getJSON('/aluminumLiner/getEnergyProductStatistics', function (result) {
+ $.getJSON('/aluminumLiner/getRunParameters', function (result) {
synthetic(result)
});
diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js
index e767a73..034e361 100644
--- a/productionboard/target/classes/static/js/common/synthetic.js
+++ b/productionboard/target/classes/static/js/common/synthetic.js
@@ -10,10 +10,10 @@ const dataInformationFunction = (statusArray) => {
${statusArray[3]} |
`;
-
$("#dataInformation").append(info);
}
const synthetic = (statusArray) => {
+ console.log(statusArray);
let info = `
${statusArray[0] || 0} |
@@ -26,19 +26,18 @@ const synthetic = (statusArray) => {
|
- ${statusArray[0] || 0} |
+ ${statusArray[4] || 0} |
|
- ${statusArray[0] || 0} |
+ ${statusArray[5] || 0} |
|
- ${statusArray[0] || 0} |
+ ${statusArray[6] || 0} |
|
- ${statusArray[0] || 0} |
+ ${statusArray[7] || 0} |
|
- ${statusArray[0] || 0}
- ${statusArray[0] || 0}
+ ${statusArray[8] || 0}
+ ${statusArray[9] || 0}
`;
-
$("#synthetic").append(info);
}
diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar
index b73774f..1f47734 100644
Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar differ
diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original
index 52ef909..2a28c89 100644
Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ