From f22632090bf67d3670f2c438e38dc31c3b43588e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 3 Mar 2026 13:54:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=93344?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 120 +++++++++++++++++++------
 1 file changed, 93 insertions(+), 27 deletions(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index adf9ed3f..5347b899 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -268,6 +268,12 @@
 					<el-table-column label="发白" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_发白 }}</span></template>
 					</el-table-column>
+					<el-table-column label="裂" class-name="colorheader2">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_裂 }}</span></template>
+					</el-table-column>
+					<el-table-column label="光圈" class-name="colorheader2">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_光圈 }}</span></template>
+					</el-table-column>
 					<el-table-column label="漏光" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_漏光 }}</span></template>
 					</el-table-column>
@@ -327,6 +333,15 @@
 					<el-table-column label="破损" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_破损 }}</span></template>
 					</el-table-column>
+					<el-table-column label="发白" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_发白 }}</span></template>
+					</el-table-column>
+					<el-table-column label="裂" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_裂 }}</span></template>
+					</el-table-column>
+					<el-table-column label="光圈" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_光圈 }}</span></template>
+					</el-table-column>
 					<el-table-column label="尺寸小" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_尺寸小 }}</span></template>
 					</el-table-column>
@@ -352,6 +367,35 @@
 						<span v-else>0</span>
 					</template>
 				</el-table-column>
+				<el-table-column label="抽检" align="center" class-name="colorheader7">
+					<el-table-column label="日期" class-name="colorheader7" width="90">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_日期 }}</span></template>
+					</el-table-column>
+					<el-table-column label="黑圈变形" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈变形 }}</span></template>
+					</el-table-column>
+					<el-table-column label="黑圈缺口" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈缺口 }}</span></template>
+					</el-table-column>
+					<el-table-column label="光圈" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_光圈 }}</span></template>
+					</el-table-column>
+					<el-table-column label="发白" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_发白 }}</span></template>
+					</el-table-column>
+					<el-table-column label="漏光" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_漏光 }}</span></template>
+					</el-table-column>
+					<el-table-column label="抽检不合格" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_抽检不合格 }}</span></template>
+					</el-table-column>
+					<el-table-column label="直通总合格数" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通总合格数 }}</span></template>
+					</el-table-column>
+					<el-table-column label="直通良率" class-name="colorheader7">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通良率 }}</span></template>
+					</el-table-column>
+				</el-table-column>
 			</el-table>
 		</el-main>
 		<el-footer>
@@ -623,44 +667,66 @@ export default {
 					propert = '外观检验_缺陷_破损';
 				}else if(index==53&&column.label=='发白'){
 					propert = '外观检验_缺陷_发白';
-				}else if(index==54&&column.label=='漏光'){
+				}else if(index==54&&column.label=='裂'){
+					propert = '外观检验_缺陷_裂';
+				}else if(index==55&&column.label=='光圈'){
+					propert = '外观检验_缺陷_光圈';
+				}else if(index==56&&column.label=='漏光'){
 					propert = '外观检验_缺陷_漏光';
-				}else if(index == 57&&column.label=='返修数'){
+				}else if(index == 59&&column.label=='返修数'){
 					propert = '外观检验_返修_count_real';
-				}else if(index==58&&column.label=='合格数'){
+				}else if(index==60&&column.label=='合格数'){
 					propert = '外观检验_返修_count_ok_full';
-				}else if(index==59&&column.label=='黑圈变形'){
+				}else if(index==61&&column.label=='黑圈变形'){
 					propert = '外观检验_返修_缺陷_黑圈变形';
-				}else if(index==60&&column.label=='气泡'){
+				}else if(index==62&&column.label=='气泡'){
 					propert = '外观检验_返修_缺陷_气泡';
-				}else if(index==61&&column.label=='浅气泡(B)'){
+				}else if(index==63&&column.label=='浅气泡(B)'){
 					propert = '外观检验_返修_缺陷_浅气泡(B)';
-				}else if(index==62&&column.label=='浅划麻(B)'){
+				}else if(index==64&&column.label=='浅划麻(B)'){
 					propert = '外观检验_返修_缺陷_浅划麻(B)';
-				}else if(index==63&&column.label=='双面划麻'){
+				}else if(index==65&&column.label=='双面划麻'){
 					propert = '外观检验_返修_缺陷_双面划麻';
-				}else if(index==64&&column.label=='浅水纹(B)'){
+				}else if(index==66&&column.label=='浅水纹(B)'){
 					propert = '外观检验_返修_缺陷_浅水纹(B)';
-				}else if(index==65&&column.label=='重水纹'){
+				}else if(index==67&&column.label=='重水纹'){
 					propert = '外观检验_返修_缺陷_重水纹';
-				}else if(index==66&&column.label=='大崩'){
+				}else if(index==68&&column.label=='大崩'){
 					propert = '外观检验_返修_缺陷_大崩';
-				}else if(index==67&&column.label=='小崩边(B)'){
+				}else if(index==69&&column.label=='小崩边(B)'){
 					propert = '外观检验_返修_缺陷_小崩边(B)';
-				}else if(index==68&&column.label=='倒角'){
+				}else if(index==70&&column.label=='倒角'){
 					propert = '外观检验_返修_缺陷_倒角';
-				}else if(index==69&&column.label=='棕点'){
+				}else if(index==71&&column.label=='棕点'){
 					propert = '外观检验_返修_缺陷_棕点';
-				}else if(index==70&&column.label=='漏光'){
+				}else if(index==72&&column.label=='漏光'){
 					propert = '外观检验_返修_缺陷_漏光';
-				}else if(index==71&&column.label=='黑圈缺口'){
+				}else if(index==73&&column.label=='黑圈缺口'){
 					propert = '外观检验_返修_缺陷_黑圈缺口';
-				}else if(index==72&&column.label=='破损'){
+				}else if(index==74&&column.label=='破损'){
 					propert = '外观检验_返修_缺陷_破损';
-				}else if(index==73&&column.label=='尺寸小'){
+				}else if(index==75&&column.label=='发白'){
+					propert = '外观检验_返修_缺陷_发白';
+				}else if(index==76&&column.label=='裂'){
+					propert = '外观检验_返修_缺陷_裂';
+				}else if(index==77&&column.label=='光圈'){
+					propert = '外观检验_返修_缺陷_光圈';
+				}else if(index==78&&column.label=='尺寸小'){
 					propert = '外观检验_返修_缺陷_尺寸小';
 				}else if(column.label=='外观总合格数'){
 					propert = '外观检验_完全总合格数';
+				}else if(index==83&&column.label=='黑圈变形'){
+					propert = '外观检验_抽检_缺陷_黑圈变形';
+				}else if(index==84&&column.label=='黑圈缺口'){
+					propert = '外观检验_抽检_缺陷_黑圈缺口';
+				}else if(index==85&&column.label=='光圈'){
+					propert = '外观检验_抽检_缺陷_光圈';
+				}else if(index==86&&column.label=='发白'){
+					propert = '外观检验_抽检_缺陷_发白';
+				}else if(index==87&&column.label=='漏光'){
+					propert = '外观检验_抽检_缺陷_漏光';
+				}else if(index==88&&column.label=='抽检不合格'){
+					propert = '外观检验_抽检_缺陷_抽检不合格';
 				}
 				if (propert!=='') {
 					const values = data.map((item) =>
@@ -689,24 +755,24 @@ export default {
 						sums[index] = ((sums[index-1]/sums[28])*100).toFixed(4);
 					}
 				}
-				if(index==74){
+				if(index==79){
 					let sum = 0;
 					if(sums[29]){
 						sum += sums[29];
 					}
-					if(sums[58]){
-						sum += sums[58];
+					if(sums[60]){
+						sum += sums[60];
 					}
 					sums[index] = sum;
 				}
-				if(index==75){
-					if(sums[74]&&sums[28]){
-						sums[index] = ((sums[74]/sums[28])*100).toFixed(2);
+				if(index==80){
+					if(sums[79]&&sums[28]){
+						sums[index] = ((sums[79]/sums[28])*100).toFixed(2);
 					}
 				}
-				if(index==76){
-					if(sums[75]&&sums[24]){
-						sums[index] = ((sums[75]*sums[24])/100).toFixed(2);
+				if(index==81){
+					if(sums[80]&&sums[24]){
+						sums[index] = ((sums[80]*sums[24])/100).toFixed(2);
 					}
 				}
 			});