From 53e2d487bf10273eb70a6147606049d9088d70bd Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 19 Dec 2025 11:03:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=92=E6=89=B3=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E7=8E=87=EF=BC=8C=E5=90=88=E6=A0=BC=E7=8E=87=E7=BA=A0=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/defect.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue
index 1f7d1459..433b7545 100644
--- a/src/views/statistics/bxerp/defect.vue
+++ b/src/views/statistics/bxerp/defect.vue
@@ -53,7 +53,7 @@
 						<span v-if="scope.row.剪切合格">{{((scope.row.剪切合格/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="剪切加功率">
+				<el-table-column label="剪切加工率">
 					<template #default="scope">
 						<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
 						<span v-else>100%</span>
@@ -71,14 +71,15 @@
 						<span v-else>0%</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="加功率">
+				<el-table-column label="加工率">
 					<template #default="scope">
-						<span v-if="scope.row.总切片合格数">{{((scope.row.总切片合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span v-if="scope.row.总切片完全合格数">{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="合格率" prop="合格率">
+					<!-- 暗点合格并且剪切合格的板段数：在暗点合格含里刨除剪切可加工和剪切不合格 -->
 					<template #default="scope">
-						<span v-if="scope.row.总切片完全合格数">{{((scope.row.总切片完全合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span v-if="scope.row.总切片完全合格数">{{((scope.row.暗点合格.仅/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -87,7 +88,6 @@
 </template>
 
 <script>
-import { genTree } from "@/utils/verificate";
 export default {
 	name: "workerTimes",
 	data() {
@@ -131,6 +131,7 @@ export default {
 					}
 					item.不合格数 = 0;
 					item.可加工数 = 0;
+					item.加工率数 = item.总切片合格数?item.总切片合格数:0-item.暗点不合格.含?item.暗点合格.含:0;
 					if(item['剪切￠18.3mm不合格']){
 						if(item['剪切￠18.3mm可加工']){
 							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含;