From 0a76b0813419e24ed740966859842465c2651eba Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 8 Jan 2026 10:29:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=92=E4=B8=80=E6=AC=A1=E6=A3=92?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/defect.vue | 31 ++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue
index 433b7545..7c354da7 100644
--- a/src/views/statistics/bxerp/defect.vue
+++ b/src/views/statistics/bxerp/defect.vue
@@ -67,7 +67,7 @@
 				</el-table-column>
 				<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>
 						<span v-else>0%</span>
 					</template>
 				</el-table-column>
@@ -120,7 +120,7 @@ export default {
             let that = this;
             let params = {};
             params.query = that.query;
-			that.$API.bi.dataset.exec.req('prodect_defect', params).then((res) => {
+			that.$API.bi.dataset.exec.req('product_defect_paiban', params).then((res) => {
 				let data = res.data2.ds0;
 				data.forEach(item=>{
 					if(item.缺陷分布!==null){
@@ -129,22 +129,19 @@ export default {
 							item[key]=defect[key];
 						}
 					}
-					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不合格'].含;
-						}else{
-							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格'].含;
-						}
-					}else{
-						if(item['剪切￠18.3mm可加工']){
-							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含;
-						}else{
-							item.剪切合格 = item.总切片数;
-						}
+					let count_cds = item.暗点不合格?item.暗点重?item.暗点不合格.含 + item.暗点重.含:item.暗点不合格.含:item.暗点重?item.暗点重.含:0;
+					item.长点数 = count_cds;
+					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
+					if(item['剪切￠18.3mm不合格+暗点不合格']){
+						count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'].含;
 					}
+					if(item['剪切￠18.3mm不合格+暗点重']){
+						count1 = count1 + item['剪切￠18.3mm不合格+暗点重'].含;
+					}
+					item.加工率数 = count1;//总数-暗点不合格含-暗点重含-剪切不合格含+两个组合数；
+					let count_jqhg = 0;
+					count_jqhg = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
+					item.剪切合格 = count_jqhg;
 				})
 				that.tableData = data;
 			});