From 1524f6f4144ad9ce425f06b2d44071ff8dfd6bd5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 19 May 2025 16:43:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 175 +++++++++++--------------
 1 file changed, 77 insertions(+), 98 deletions(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index 655290e5..6a0c9dbd 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -55,7 +55,7 @@
 							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_日期 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验人" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_检验人 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_操作人 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验数" class-name="colorheader1">
 							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_real }}</span></template>
@@ -67,49 +67,49 @@
 							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈内径_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈外径" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈外径 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈外径 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈外径_比例 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈外径_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="产品同心度" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品同心度 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品同心度 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品同心度_比例 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品同心度_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="圆度" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_圆度 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度_比例 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_圆度_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="产品外径小" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品外径小 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品外径小 }}</span></template>
 						</el-table-column>
-						<el-table-column label="产品外径大（返修）" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品外径大 }}</span></template>
+						<el-table-column label="产品外径大(返修)" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品外径大(返修) }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈缺口" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈缺口 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈缺口 }}</span></template>
 						</el-table-column>
 						<el-table-column label="外径发货片(B)" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_外径发货片 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_外径发货片 }}</span></template>
 						</el-table-column>
 						<el-table-column label="前道崩" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_前道崩 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_前道崩 }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader1">
 							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_ok_full }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_合格率 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_完全合格率 }}</span></template>
 						</el-table-column>
-						<el-table-column label="准合格" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_准合格 }}</span></template>
+						<el-table-column label="准合格(B)" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_准合格(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="圆度准合格" class-name="colorheader1">
-							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度准合格 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_圆准(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="总合格数" class-name="colorheader1">
 							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_ok }}</span></template>
@@ -129,73 +129,70 @@
 							<template  #default="scope"><span>{{ scope.row.data.外观检验_count_real }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_count_ok }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_count_ok_full }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_合格率 }}</span></template>
+							<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 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 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>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_气泡 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅气泡(B)" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅气泡 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_浅气泡(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈变形" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_黑圈变形 }}</span></template>
+							<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>
+							<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>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_重水纹 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅水纹(B)" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅水纹 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_浅水纹(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="大崩" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_大崩 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_大崩 }}</span></template>
 						</el-table-column>
 						<el-table-column label="小崩边(B)" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_小崩边 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_小崩边(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="棕点" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_棕点 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_棕点 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅划麻(B)" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅划麻 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_浅划麻(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="双面划麻" class-name="colorheader2">
-							<template  #default="scope"><span>{{ scope.row.data.外观检验_双面划麻 }}</span></template>
+							<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>
+							<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>
+							<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>
+							<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>
+							<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>
+							<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>
+							<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>
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_漏光 }}</span></template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="返修" align="center" class-name="colorheader3">
@@ -209,80 +206,62 @@
 							<template  #default="scope"><span>{{ scope.row.data.返修_count_real }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_count_ok }}</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="浅气泡(B)" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_气泡B }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.返修_count_ok_full }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈变形" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_黑圈变形 }}</span></template>
+							<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 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="浅水纹(B)" 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="小崩边(B)" 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 label="浅气泡(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_缺陷_浅气泡(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅划麻(B)" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_浅划麻 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.返修_缺陷_浅划麻(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="双面划麻" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_双面划麻 }}</span></template>
+							<template  #default="scope"><span>{{ scope.row.data.返修_缺陷_双面划麻 }}</span></template>
+						</el-table-column>
+						<el-table-column label="浅水纹(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_缺陷_浅水纹(B) }}</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="小崩边(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_缺陷_小崩边(B) }}</span></template>
 						</el-table-column>
 						<el-table-column label="倒角" class-name="colorheader3">
-							<template  #default="scope"><span>{{ scope.row.data.返修_倒角 }}</span></template>
+							<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>
-						<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 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>
+							<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>
 					<el-table-column label="外观总合格数" class-name="colorheader4">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_总合格数 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_完全总合格数 }}</span></template>
 					</el-table-column>
 					<el-table-column label="外观总合格率" class-name="colorheader4">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_总合格率 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_完全总合格率 }}</span></template>
 					</el-table-column>
 					<el-table-column label="直通良率" class-name="colorheader4">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_直通良率 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_完全直通合格率 }}</span></template>
 					</el-table-column>
 				</scTable>
 		</el-main>