diff --git a/productionboard/src/main/resources/static/css/tankShell/device.css b/productionboard/src/main/resources/static/css/tankShell/device.css index d77bd08..17bfe6d 100644 --- a/productionboard/src/main/resources/static/css/tankShell/device.css +++ b/productionboard/src/main/resources/static/css/tankShell/device.css @@ -47,10 +47,10 @@ body { display: flex; justify-content: center; align-items: center; - font-size: 16px !important; + /* font-size: 16px !important; */ } -.lossParam{ +.lossParam { border: 0px solid yellowgreen; position: absolute; width: 8.8%; @@ -61,10 +61,10 @@ body { justify-content: center; align-items: center; color: #8FB7D1; - font-size: 16px !important; + font-size: 230% !important; } -.meterParam{ +.meterParam { border: 0px solid yellowgreen; position: absolute; width: 8.8%; @@ -74,8 +74,8 @@ body { display: flex; justify-content: center; align-items: center; - color:#A5E3B1; - font-size: 16px !important; + color: #A5E3B1; + font-size: 230% !important; } .OEEStatistics { diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index dcbf96a..b80bb83 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -2,7 +2,7 @@ const dataInformationFunction = (statusArray) => { let info = ` - + @@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => { const synthetic = (statusArray) => { let info = `
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 1 ? `运行正常` : `运行异常`} ${statusArray[1]}
- - - - - + + + + +
123123123123123123123123
- + - + - + - +
123123 123123 123123 123123
- 123213 - 123213 + 123213 + 123213 `; $("#synthetic").append(info); diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 9a9bd7e..ed92d04 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -70,7 +70,7 @@ $(() => { const dataInformationFunction = (statusArray) => { let info = ` - + @@ -87,10 +87,10 @@ const dataInformationFunction = (statusArray) => { const energyProductionStatisticsFunction = (statusArray) => { let info = `
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 1 ? `运行正常` : `运行异常`} 389kW
- - - - + + + +
68675686756867568675
`; @@ -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/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html index 53a2f65..406e25c 100644 --- a/productionboard/src/main/resources/templates/tankShell/device.html +++ b/productionboard/src/main/resources/templates/tankShell/device.html @@ -20,12 +20,13 @@
- +
-
+ -
+ +
diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css index d77bd08..17bfe6d 100644 --- a/productionboard/target/classes/static/css/tankShell/device.css +++ b/productionboard/target/classes/static/css/tankShell/device.css @@ -47,10 +47,10 @@ body { display: flex; justify-content: center; align-items: center; - font-size: 16px !important; + /* font-size: 16px !important; */ } -.lossParam{ +.lossParam { border: 0px solid yellowgreen; position: absolute; width: 8.8%; @@ -61,10 +61,10 @@ body { justify-content: center; align-items: center; color: #8FB7D1; - font-size: 16px !important; + font-size: 230% !important; } -.meterParam{ +.meterParam { border: 0px solid yellowgreen; position: absolute; width: 8.8%; @@ -74,8 +74,8 @@ body { display: flex; justify-content: center; align-items: center; - color:#A5E3B1; - font-size: 16px !important; + color: #A5E3B1; + font-size: 230% !important; } .OEEStatistics { diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index dcbf96a..b80bb83 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -2,7 +2,7 @@ const dataInformationFunction = (statusArray) => { let info = ` - + @@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => { const synthetic = (statusArray) => { let info = `
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 1 ? `运行正常` : `运行异常`} ${statusArray[1]}
- - - - - + + + + +
123123123123123123123123
- + - + - + - +
123123 123123 123123 123123
- 123213 - 123213 + 123213 + 123213 `; $("#synthetic").append(info); diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 9a9bd7e..ed92d04 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -70,7 +70,7 @@ $(() => { const dataInformationFunction = (statusArray) => { let info = ` - + @@ -87,10 +87,10 @@ const dataInformationFunction = (statusArray) => { const energyProductionStatisticsFunction = (statusArray) => { let info = `
${statusArray[0] == 0 ? `运行正常` : `运行异常`}${statusArray[0] == 1 ? `运行正常` : `运行异常`} 389kW
- - - - + + + +
68675686756867568675
`; @@ -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 53a2f65..406e25c 100644 --- a/productionboard/target/classes/templates/tankShell/device.html +++ b/productionboard/target/classes/templates/tankShell/device.html @@ -20,12 +20,13 @@
- +
-
+ -
+ +