优化生产计算显示布局,调整每天重量、轴数和箱数为条件渲染,修复PT-4线盘箱数计算逻辑

master
huangjinysf 2 months ago
parent c8a83aab3b
commit a94b54e94a

@ -138,19 +138,13 @@
<span class="detail-label">小时轴数:</span> <span class="detail-label">小时轴数:</span>
<span class="detail-value">{{ calculateAxlesPerHour() }} </span> <span class="detail-value">{{ calculateAxlesPerHour() }} </span>
</div> </div>
<div class="detail-row"> <div v-if="selectedAxle.update_time && selectedAxle.total_quantity && productionScheduleData && productionScheduleData.axle_final_average_speed && productionScheduleData.axle_final_average_weight" class="detail-row stock-row">
<span class="detail-label">每天重量:</span> <span class="detail-label stock-label">每天重量:</span>
<span class="detail-value">{{ calculateDailyWeight() }} kg</span> <span class="detail-value stock-item-weight">{{ calculateDailyWeight() }} kg</span>
</div> <span class="detail-label stock-label">每天轴数:</span>
<div class="detail-row daily-production-row"> <span class="detail-value stock-item-number">{{ calculateAxlesPerDay() }} </span>
<div class="daily-production-item"> <span class="detail-label stock-label">每天箱数:</span>
<span class="detail-label">每天轴数:</span> <span class="detail-value stock-item-number">{{ calculateBoxesPerDay() }} </span>
<span class="detail-value">{{ calculateAxlesPerDay() }} </span>
</div>
<div class="daily-production-item">
<span class="detail-label">每天箱数:</span>
<span class="detail-value">{{ calculateBoxesPerDay() }} </span>
</div>
</div> </div>
</div> </div>
@ -734,19 +728,24 @@ const calculateDailyWeight = () => {
// wire_disc // wire_disc
const calculateBoxesPerDay = () => { const calculateBoxesPerDay = () => {
const axlesPerDay = calculateAxlesPerDay(); const axlesPerDay = calculateAxlesPerDay();
// 线0 // 线0
if (!selectedAxle.value || !selectedAxle.value.raw_wire_disc) { if (!selectedAxle.value || !selectedAxle.value.raw_wire_disc) {
return 0; return 0;
} }
// axlesPerDay
const axlesPerDayNum = parseFloat(axlesPerDay);
if (isNaN(axlesPerDayNum)) {
return 0;
}
// wire_disc // wire_disc
if (selectedAxle.value.wire_disc === 'PT-25') { if (selectedAxle.value.wire_disc === 'PT-4') {
// 'PT-25'/4 // 'PT-4'/4
return (axlesPerDay / 4).toFixed(2); return (axlesPerDayNum / 4).toFixed(2);
} else { } else {
// /1 // /1
return axlesPerDay.toFixed(2); return axlesPerDayNum.toFixed(2);
} }
}; };
@ -1354,7 +1353,7 @@ const updateCharts = () => {
} }
.daily-production-item { .daily-production-item {
min-width: 45%; min-width: 30%;
margin-right: 10px; margin-right: 10px;
display: flex; display: flex;
} }

Loading…
Cancel
Save