diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue
index 6f94f05..04554a4 100644
--- a/src/views/board/foaming/index.vue
+++ b/src/views/board/foaming/index.vue
@@ -74,7 +74,7 @@
东线
西线
- 注射压力标准范围:10.0-14.0Mpa A、B组份枪头压力差<1Mpa
+ 注射压力标准范围:10.0-14.0Mpa A、B组份枪头压力差≤1Mpa
发泡料温度标准范围:18.0-24.0℃
@@ -577,7 +577,7 @@ export default {
value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2),
value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0),
value3: totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0),
- value4: ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2),
+ value4: totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0) === 0 ? 0 : ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2),
value5: totalArr.map(val => val.value8).reduce((acc, curr) => acc + curr, 0),
value6: totalArr.map(val => val.value9).reduce((acc, curr) => acc + curr, 0),
value7: totalArr.map(val => val.value10).reduce((acc, curr) => acc + curr, 0),
@@ -1178,7 +1178,7 @@ export default {
value4: val.TARGET,
value5: val.PLAN_SUM,
value6: val.PRO_SUM,
- value7: ((val.PRO_SUM / val.TARGET) * 100).toFixed(2) + '%',
+ value7: (val.PLAN_SUM === 0 ? 0 :((val.PRO_SUM / val.PLAN_SUM) * 100).toFixed(2) )+ '%',
value8: val.ANHOUR,
value9: val.TWOHOUR,
value10: val.THREEHOUR,
@@ -1200,7 +1200,7 @@ export default {
value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2),
value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0),
value3: totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0),
- value4: ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2),
+ value4: totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0) === 0 ? 0 : ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2),
value5: totalArr.map(val => val.value8).reduce((acc, curr) => acc + curr, 0),
value6: totalArr.map(val => val.value9).reduce((acc, curr) => acc + curr, 0),
value7: totalArr.map(val => val.value10).reduce((acc, curr) => acc + curr, 0),
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue
index 8ae93b4..4679141 100644
--- a/src/views/board/foaming/index2.vue
+++ b/src/views/board/foaming/index2.vue
@@ -17,12 +17,12 @@
:style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
{{ i }}
-
+ 发泡线状态:
+ 发泡机状态:
+
+
生产节拍:
线体1圈 {{ ' ' + meter1 }}s
@@ -30,7 +30,7 @@
- 注射压力标准范围:10.0-14.0Mpa A、B组份枪头压力差<1Mpa
+ 注射压力标准范围:10.0-14.0Mpa A、B组份枪头压力差≤1Mpa
发泡料温度标准范围:18.0-24.0℃
@@ -163,6 +163,7 @@ export default {
'门体发泡生产统计',
],
status1: 0,
+ status2: 0,
meter1: 0,
meter2: 0,
titlePosition: [
@@ -754,6 +755,7 @@ export default {
f: (e) => {
// console.log(e)
this.status1 = e[0]?.X_VALUE
+ this.status2 = e[0]?.X_VALUE
this.meter1 = e[0]?.Y_VALUE_ONE
this.meter2 = e[0]?.Y_VALUE_TWO
}
@@ -902,14 +904,26 @@ export default {
.status1 {
position: absolute;
transform: translate(-50%, -50%);
- top: 73%;
- left: 45%;
+ top: 24.4%;
+ left: 36%;
+ width: 1.5vw;
+ height: 1.5vw;
+ background: #00ff00;
+ border-radius: 50%;
+}
+
+.status2 {
+ position: absolute;
+ transform: translate(-50%, -50%);
+ top: 28.2%;
+ left: 36%;
width: 1.5vw;
height: 1.5vw;
background: #00ff00;
border-radius: 50%;
}
+
.scrollTable1 {
position: absolute;
top: 66%;