diff --git a/src/views/plan/EquipmentStatus.vue b/src/views/plan/EquipmentStatus.vue index 2c4ed66..28f4f45 100644 --- a/src/views/plan/EquipmentStatus.vue +++ b/src/views/plan/EquipmentStatus.vue @@ -138,19 +138,13 @@ 小时轴数: {{ calculateAxlesPerHour() }} 轴 -
- 每天重量: - {{ calculateDailyWeight() }} kg -
-
-
- 每天轴数: - {{ calculateAxlesPerDay() }} 轴 -
-
- 每天箱数: - {{ calculateBoxesPerDay() }} 箱 -
+
+ 每天重量: + {{ calculateDailyWeight() }} kg + 每天轴数: + {{ calculateAxlesPerDay() }} 轴 + 每天箱数: + {{ calculateBoxesPerDay() }} 箱
@@ -734,19 +728,24 @@ const calculateDailyWeight = () => { // 计算每天箱数,根据wire_disc进行判断 const calculateBoxesPerDay = () => { const axlesPerDay = calculateAxlesPerDay(); - // 如果没有选中轴或者没有线盘信息,返回0 if (!selectedAxle.value || !selectedAxle.value.raw_wire_disc) { return 0; } + // 确保axlesPerDay是数字类型 + const axlesPerDayNum = parseFloat(axlesPerDay); + if (isNaN(axlesPerDayNum)) { + return 0; + } + // 根据wire_disc判断计算方法 - if (selectedAxle.value.wire_disc === 'PT-25') { - // 如果是'PT-25',则每天轴数/4 - return (axlesPerDay / 4).toFixed(2); + if (selectedAxle.value.wire_disc === 'PT-4') { + // 如果是'PT-4',则每天轴数/4 + return (axlesPerDayNum / 4).toFixed(2); } else { // 其他情况,每天轴数/1 - return axlesPerDay.toFixed(2); + return axlesPerDayNum.toFixed(2); } }; @@ -1354,7 +1353,7 @@ const updateCharts = () => { } .daily-production-item { - min-width: 45%; + min-width: 30%; margin-right: 10px; display: flex; }