diff --git a/productionboard/src/main/resources/static/css/adsorptionTank/style.css b/productionboard/src/main/resources/static/css/adsorptionTank/style.css index aca4413..185c824 100644 --- a/productionboard/src/main/resources/static/css/adsorptionTank/style.css +++ b/productionboard/src/main/resources/static/css/adsorptionTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/aluminumTank/style.css b/productionboard/src/main/resources/static/css/aluminumTank/style.css index 3c4d776..54b4ca8 100644 --- a/productionboard/src/main/resources/static/css/aluminumTank/style.css +++ b/productionboard/src/main/resources/static/css/aluminumTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/preassemble/style.css b/productionboard/src/main/resources/static/css/preassemble/style.css index 0865699..70685ad 100644 --- a/productionboard/src/main/resources/static/css/preassemble/style.css +++ b/productionboard/src/main/resources/static/css/preassemble/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/tankShell/style.css b/productionboard/src/main/resources/static/css/tankShell/style.css index e84e37e..2b61a0a 100644 --- a/productionboard/src/main/resources/static/css/tankShell/style.css +++ b/productionboard/src/main/resources/static/css/tankShell/style.css @@ -32,4 +32,9 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} + +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/js/common/ondutyplan.js b/productionboard/src/main/resources/static/js/common/ondutyplan.js index 4bab15c..24007b6 100644 --- a/productionboard/src/main/resources/static/js/common/ondutyplan.js +++ b/productionboard/src/main/resources/static/js/common/ondutyplan.js @@ -3,7 +3,7 @@ $(() =>{ let html = `
- - - - + - -
diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 41ce396..1bed0f4 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -1,4 +1,5 @@ $(() => { + //班组计划统计 // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { @@ -6,11 +7,13 @@ $(() => { }); //设备运行状态 - let statusArray = [0, 0, 0, 0, 1, 0]; - deviceStatus(statusArray); + $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { + deviceStatus(result); + }); + //库存统计 - $.getJSON('/foamBox/getMaterialStoreJson', function (result) { + $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); @@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => { $(".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 fb2b052..784e3d5 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -1,5 +1,5 @@ - + @@ -67,6 +67,8 @@ disableOnInteraction: false, }, }); + + const ids = [[${positionId}]]; // let info = ` // diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index d94df6e..d3b75bb 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class and b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class differ diff --git a/productionboard/target/classes/static/css/adsorptionTank/style.css b/productionboard/target/classes/static/css/adsorptionTank/style.css index aca4413..185c824 100644 --- a/productionboard/target/classes/static/css/adsorptionTank/style.css +++ b/productionboard/target/classes/static/css/adsorptionTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/target/classes/static/css/aluminumTank/style.css b/productionboard/target/classes/static/css/aluminumTank/style.css index 3c4d776..54b4ca8 100644 --- a/productionboard/target/classes/static/css/aluminumTank/style.css +++ b/productionboard/target/classes/static/css/aluminumTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/target/classes/static/css/preassemble/style.css b/productionboard/target/classes/static/css/preassemble/style.css index 0865699..70685ad 100644 --- a/productionboard/target/classes/static/css/preassemble/style.css +++ b/productionboard/target/classes/static/css/preassemble/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/target/classes/static/css/tankShell/style.css b/productionboard/target/classes/static/css/tankShell/style.css index e84e37e..2b61a0a 100644 --- a/productionboard/target/classes/static/css/tankShell/style.css +++ b/productionboard/target/classes/static/css/tankShell/style.css @@ -32,4 +32,9 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} + +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/target/classes/static/js/common/ondutyplan.js b/productionboard/target/classes/static/js/common/ondutyplan.js index 4bab15c..24007b6 100644 --- a/productionboard/target/classes/static/js/common/ondutyplan.js +++ b/productionboard/target/classes/static/js/common/ondutyplan.js @@ -3,7 +3,7 @@ $(() =>{ let html = `
- - - - + - -
diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index 41ce396..b17ecc5 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -1,4 +1,5 @@ $(() => { + //班组计划统计 // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { @@ -6,11 +7,13 @@ $(() => { }); //设备运行状态 - let statusArray = [0, 0, 0, 0, 1, 0]; - deviceStatus(statusArray); + $.getJSON(`/foamBox/getRunStatusJson?id=${ids}`, function (result) { + deviceStatus(result); + }); + //库存统计 - $.getJSON('/foamBox/getMaterialStoreJson', function (result) { + $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); @@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => { $(".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 fb2b052..784e3d5 100644 --- a/productionboard/target/classes/templates/foamBox/index.html +++ b/productionboard/target/classes/templates/foamBox/index.html @@ -1,5 +1,5 @@ - + @@ -67,6 +67,8 @@ disableOnInteraction: false, }, }); + + const ids = [[${positionId}]]; // let info = ` //