diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 3b14a3d..41ce396 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -1,23 +1,28 @@ $(() => { //班组计划统计 - onDutyPlan(1234, 1202, 33); + // onDutyPlan(1234, 1202, 33); + $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { + onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,) + }); //设备运行状态 let statusArray = [0, 0, 0, 0, 1, 0]; deviceStatus(statusArray); //库存统计 - $.getJSON('/foamBox/getInventoryStatistics', function (result) { + $.getJSON('/foamBox/getMaterialStoreJson', function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); //按型号统计产量 - $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { + $.getJSON('/foamBox/getMaterialProdutionJson', function (result) { horizontalBarChart(result, document.getElementById("statisticalOutputByModel")); }); //小时产量 - brokenLineAreaDiagram(null, document.getElementById("hourlyOutputStatistics")); + $.getJSON('/foamBox/getHourProdutionJson', function (result) { + brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics")); + }); //发泡参数 multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters")); @@ -125,15 +130,15 @@ $(() => { const deviceStatus = (statusArray) => { let info = ` - - - - - - + + + + + +
`; - $("#deviceRunStatus").append(info); + $(".foamingLineRunStatus table tr").append(info); } \ No newline at end of file diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html index 402322e..fb2b052 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -68,15 +68,15 @@ }, }); - let info = ` - - - - - - - `; - $(".foamingLineRunStatus table tr").append(info); + // let info = ` + // + // + // + // + // + // + // `; + // $(".foamingLineRunStatus table tr").append(info); \ No newline at end of file diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index 3b14a3d..41ce396 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -1,23 +1,28 @@ $(() => { //班组计划统计 - onDutyPlan(1234, 1202, 33); + // onDutyPlan(1234, 1202, 33); + $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { + onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,) + }); //设备运行状态 let statusArray = [0, 0, 0, 0, 1, 0]; deviceStatus(statusArray); //库存统计 - $.getJSON('/foamBox/getInventoryStatistics', function (result) { + $.getJSON('/foamBox/getMaterialStoreJson', function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); //按型号统计产量 - $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { + $.getJSON('/foamBox/getMaterialProdutionJson', function (result) { horizontalBarChart(result, document.getElementById("statisticalOutputByModel")); }); //小时产量 - brokenLineAreaDiagram(null, document.getElementById("hourlyOutputStatistics")); + $.getJSON('/foamBox/getHourProdutionJson', function (result) { + brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics")); + }); //发泡参数 multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters")); @@ -125,15 +130,15 @@ $(() => { const deviceStatus = (statusArray) => { let info = ` - - - - - - + + + + + +
`; - $("#deviceRunStatus").append(info); + $(".foamingLineRunStatus table tr").append(info); } \ No newline at end of file diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html index 402322e..fb2b052 100644 --- a/productionboard/target/classes/templates/foamBox/index.html +++ b/productionboard/target/classes/templates/foamBox/index.html @@ -68,15 +68,15 @@ }, }); - let info = ` - - - - - - - `; - $(".foamingLineRunStatus table tr").append(info); + // let info = ` + // + // + // + // + // + // + // `; + // $(".foamingLineRunStatus table tr").append(info); \ No newline at end of file