diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css index 50aaacf..6b81da4 100644 --- a/productionboard/src/main/resources/static/css/foamBox/style.css +++ b/productionboard/src/main/resources/static/css/foamBox/style.css @@ -32,6 +32,14 @@ body { left: 59%; } +.foamingLineRunStatus { + position: absolute; + width: 40%; + height: 27%; + top: 10.5%; + left: 30.1%; +} + .inventoryStatistics { border: 0px solid red; position: absolute; @@ -86,19 +94,23 @@ body { color: white; font-size: 12px; } -.temperatureOne{ + +.temperatureOne { width: 100%; height: 100%; } -.temperatureTwo{ + +.temperatureTwo { width: 100%; height: 100%; } -.temperatureThree{ + +.temperatureThree { width: 100%; height: 100%; } -.temperatureFour{ + +.temperatureFour { width: 100%; height: 100%; } diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index da0de5f..9a9bd7e 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -1,5 +1,5 @@ $(() => { - + //设备OEE统计 OEEStatistics(null, document.getElementById("OEEStatistics")); @@ -17,7 +17,7 @@ $(() => { $.getJSON('/tankShell/getInventoryStatistics', function (result) { energyConsumption(result, document.getElementById("energyConsumption")); }); - + //生产计划 $.ajax({ url: '/storage/getProductionPlan', @@ -32,7 +32,7 @@ $(() => { val[3] = '2021.01.01 10:00:00' delete val[4] }); - Res.header = ['设备名称', '参数名称', '当前值', '时间', ] + Res.header = ['设备名称', '参数名称', '当前值', '时间',] dynamicTable({ el: '#productionPlan', rowNum: 5, @@ -45,7 +45,7 @@ $(() => { headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['100%', '100%', '40%', '160%', ] + colWidth: ['100%', '100%', '40%', '160%',] }); }, error: function (e) { @@ -70,7 +70,7 @@ $(() => { const dataInformationFunction = (statusArray) => { let info = ` - + diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html index 8b90582..cdb8983 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -30,7 +30,7 @@
- +
diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html index 5e75a67..53a2f65 100644 --- a/productionboard/src/main/resources/templates/tankShell/device.html +++ b/productionboard/src/main/resources/templates/tankShell/device.html @@ -4,6 +4,8 @@ 箱壳成型数据监控平台 + + diff --git a/productionboard/target/classes/static/css/foamBox/style.css b/productionboard/target/classes/static/css/foamBox/style.css index 50aaacf..6b81da4 100644 --- a/productionboard/target/classes/static/css/foamBox/style.css +++ b/productionboard/target/classes/static/css/foamBox/style.css @@ -32,6 +32,14 @@ body { left: 59%; } +.foamingLineRunStatus { + position: absolute; + width: 40%; + height: 27%; + top: 10.5%; + left: 30.1%; +} + .inventoryStatistics { border: 0px solid red; position: absolute; @@ -86,19 +94,23 @@ body { color: white; font-size: 12px; } -.temperatureOne{ + +.temperatureOne { width: 100%; height: 100%; } -.temperatureTwo{ + +.temperatureTwo { width: 100%; height: 100%; } -.temperatureThree{ + +.temperatureThree { width: 100%; height: 100%; } -.temperatureFour{ + +.temperatureFour { width: 100%; height: 100%; } diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index da0de5f..9a9bd7e 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -1,5 +1,5 @@ $(() => { - + //设备OEE统计 OEEStatistics(null, document.getElementById("OEEStatistics")); @@ -17,7 +17,7 @@ $(() => { $.getJSON('/tankShell/getInventoryStatistics', function (result) { energyConsumption(result, document.getElementById("energyConsumption")); }); - + //生产计划 $.ajax({ url: '/storage/getProductionPlan', @@ -32,7 +32,7 @@ $(() => { val[3] = '2021.01.01 10:00:00' delete val[4] }); - Res.header = ['设备名称', '参数名称', '当前值', '时间', ] + Res.header = ['设备名称', '参数名称', '当前值', '时间',] dynamicTable({ el: '#productionPlan', rowNum: 5, @@ -45,7 +45,7 @@ $(() => { headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['100%', '100%', '40%', '160%', ] + colWidth: ['100%', '100%', '40%', '160%',] }); }, error: function (e) { @@ -70,7 +70,7 @@ $(() => { const dataInformationFunction = (statusArray) => { let info = `
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 0 ? `运行正常` : `运行异常`} 389kW
- + diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html index 8b90582..cdb8983 100644 --- a/productionboard/target/classes/templates/foamBox/index.html +++ b/productionboard/target/classes/templates/foamBox/index.html @@ -30,7 +30,7 @@
- +
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html index 5e75a67..53a2f65 100644 --- a/productionboard/target/classes/templates/tankShell/device.html +++ b/productionboard/target/classes/templates/tankShell/device.html @@ -4,6 +4,8 @@ 箱壳成型数据监控平台 + +
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 0 ? `运行正常` : `运行异常`} 389kW