diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css index fa0a5c8..6e10715 100644 --- a/productionboard/src/main/resources/static/css/foamBox/style.css +++ b/productionboard/src/main/resources/static/css/foamBox/style.css @@ -34,10 +34,10 @@ body { .foamingLineRunStatus { position: absolute; - width: 41%; + width: 40%; height: 27%; - top: 10%; - left: 33%; + top: 12%; + left: 30%; } .inventoryStatistics { diff --git a/productionboard/src/main/resources/static/img/foamBox/foamBoxbackground.jpg b/productionboard/src/main/resources/static/img/foamBox/foamBoxbackground.jpg index c9a33f6..4093046 100644 Binary files a/productionboard/src/main/resources/static/img/foamBox/foamBoxbackground.jpg and b/productionboard/src/main/resources/static/img/foamBox/foamBoxbackground.jpg differ diff --git a/productionboard/src/main/resources/static/js/common/date-time-common.js b/productionboard/src/main/resources/static/js/common/date-time-common.js index 7361c52..f7f7094 100644 --- a/productionboard/src/main/resources/static/js/common/date-time-common.js +++ b/productionboard/src/main/resources/static/js/common/date-time-common.js @@ -1,8 +1,8 @@ -document.write('
\n' + +document.write('
\n' + ' \n' + '
\n' + '\n' + - '
\n' + + '
\n' + ' \n' + '
\n') diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 9f873e7..4c6c5b4 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -6,9 +6,10 @@ $(() => { }); //设备运行状态 - $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { - deviceStatus(result); - }); + // $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { + // deviceStatus(result); + // }); + deviceStatus([1,1,1,1,1,1]); //库存统计 @@ -120,13 +121,12 @@ $(() => { const deviceStatus = (statusArray) => { let info = ` - - - - - - - + + + + + +
`;