diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css
index 17bfe6d..6861cf4 100644
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@@ -22,7 +22,7 @@ body {
position: absolute;
width: 42%;
height: 6%;
- top: 9%;
+ top: 8%;
left: 29%;
font-size: 16px !important;
}
@@ -61,7 +61,7 @@ body {
justify-content: center;
align-items: center;
color: #8FB7D1;
- font-size: 230% !important;
+ font-size: 175% !important;
}
.meterParam {
@@ -75,7 +75,7 @@ body {
justify-content: center;
align-items: center;
color: #A5E3B1;
- font-size: 230% !important;
+ font-size: 175% !important;
}
.OEEStatistics {
diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js
index a0cb7d3..0446075 100644
--- a/productionboard/target/classes/static/js/aluminumLiner/index.js
+++ b/productionboard/target/classes/static/js/aluminumLiner/index.js
@@ -2,23 +2,25 @@ $(() => {
//数据信息
$.getJSON('/aluminumLiner/getDataInformation', function (result) {
- const statusArray = [1,0,0,0,0];
- if(result.length > 0) {
+ const statusArray = [1, 0, 0, 0, 0];
+ if (result.length > 0) {
statusArray[0] = result[0].deviceStatus == "正常" ? 0 : 1;
statusArray[1] = result[0].devicePower;
statusArray[2] = result[0].deviceEnergy;
}
dataInformationFunction(statusArray);
});
+ $.getJSON('10.41.9.111:6069/aluminumLiner/getEnergyProductStatistics', function (result) {
+ debugger
+ synthetic(result)
+ });
+
//loss/aluminumLiner/getLossStatistics
$.getJSON('/aluminumLiner/getLossStatistics', function (result) {
loss(result, document.getElementById("loss"));
});
- const syntheticDate = [0, 0, 0, 0, 0];
-
- synthetic(syntheticDate)
//设备OEE统计
OEEStatistics(null, document.getElementById("OEEStatistics"));
@@ -64,8 +66,8 @@ $(() => {
}
});
-
-
+
+
//设备故障排名
$.getJSON('/tankShell/getStatisticalOutputByModel', function (result) {
equipmentFailure(result, document.getElementById("equipmentFailure"));
diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js
index b80bb83..c7a27d4 100644
--- a/productionboard/target/classes/static/js/common/synthetic.js
+++ b/productionboard/target/classes/static/js/common/synthetic.js
@@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => {
const synthetic = (statusArray) => {
let info = `
- 123 |
- 123 |
- 123 |
- 123 |
- |
+ ${statusArray.yesterdayEnergy || 0} |
+ ${statusArray.thisMonthProuction || 0} |
+ ${statusArray.yesterdayProuction || 0} |
+ ${statusArray.thisMonthEnergy || 0} |
+ |
|
- 123 |
+ ${statusArray.yesterdayEnergy || 0} |
|
- 123 |
+ ${statusArray.yesterdayEnergy || 0} |
|
- 123 |
+ ${statusArray.yesterdayEnergy || 0} |
|
- 123 |
+ ${statusArray.yesterdayEnergy || 0} |
|
-
123213
-
123213
+
${statusArray.yesterdayEnergy || 0}
+
${statusArray.yesterdayEnergy || 0}
`;
$("#synthetic").append(info);
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index ed92d04..8678d26 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -87,10 +87,10 @@ const dataInformationFunction = (statusArray) => {
const energyProductionStatisticsFunction = (statusArray) => {
let info = `
- 68 |
- 675 |
- 68 |
- 675 |
+ 68 |
+ 675 |
+ 68 |
+ 675 |
`;
@@ -99,10 +99,10 @@ const energyProductionStatisticsFunction = (statusArray) => {
const runParamStatisticsFunction = (statusArray) => {
let info = `
-
68
-
685
-
685
-
685
+
68
+
685
+
685
+
685
`;
$("#runParamStatistics").append(info);
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html
index 406e25c..db36b3a 100644
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@@ -20,7 +20,7 @@
-