diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index 74738856..8613d743 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -288,10 +288,10 @@
 					<el-table-column label="返修数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_real }}</span></template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
+					<!-- <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">
+					</el-table-column> -->
+					<el-table-column label="合格数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_ok_full }}</span></template>
 					</el-table-column>
 					<el-table-column label="黑圈变形" class-name="colorheader3">
@@ -303,15 +303,15 @@
 					<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="浅划麻(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 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>
@@ -362,10 +362,10 @@
 					<el-table-column label="返修数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_real }}</span></template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
+					<!-- <el-table-column label="合格数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_ok }}</span></template>
-					</el-table-column>
-					<el-table-column label="完全合格数" class-name="colorheader3">
+					</el-table-column> -->
+					<el-table-column label="合格数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_ok_full }}</span></template>
 					</el-table-column>
 					<el-table-column label="黑圈变形" class-name="colorheader3">
@@ -380,9 +380,12 @@
 					<el-table-column label="浅划麻(B)" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_浅划麻(B)'] }}</span></template>
 					</el-table-column>
-					<el-table-column label="双面划麻" class-name="colorheader3">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_双面划麻 }}</span></template>
+					<el-table-column label="划麻(返修)" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_划麻(返修)'] }}</span></template>
 					</el-table-column>
+					<!-- <el-table-column label="双面划麻" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_双面划麻 }}</span></template>
+					</el-table-column> -->
 					<el-table-column label="浅水纹(B)" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_浅水纹(B)'] }}</span></template>
 					</el-table-column>
@@ -762,8 +765,8 @@ export default {
 					propert = '外观检验_返修_缺陷_浅气泡(B)';
 				}else if(index==64&&column.label=='浅划麻(B)'){
 					propert = '外观检验_返修_缺陷_浅划麻(B)';
-				}else if(index==65&&column.label=='双面划麻'){
-					propert = '外观检验_返修_缺陷_双面划麻';
+				}else if(index==65&&column.label=='划麻(返修)'){
+					propert = '外观检验_返修_缺陷_划麻(返修)';
 				}else if(index==66&&column.label=='浅水纹(B)'){
 					propert = '外观检验_返修_缺陷_浅水纹(B)';
 				}else if(index==67&&column.label=='重水纹'){
@@ -790,19 +793,61 @@ export default {
 					propert = '外观检验_返修_缺陷_光圈';
 				}else if(index==78&&column.label=='尺寸小'){
 					propert = '外观检验_返修_缺陷_尺寸小';
-				}else if(column.label=='外观总合格数'){
-					propert = '外观检验_完全总合格数';
+				}
+				else if(index == 81&&column.label=='返修数'){
+					propert = '外观检验_返修2_count_real';
+				}else if(index==82&&column.label=='合格数'){
+					propert = '外观检验_返修2_count_ok_full';
 				}else if(index==83&&column.label=='黑圈变形'){
+					propert = '外观检验_返修2_缺陷_黑圈变形';
+				}else if(index==84&&column.label=='气泡'){
+					propert = '外观检验_返修2_缺陷_气泡';
+				}else if(index==85&&column.label=='浅气泡(B)'){
+					propert = '外观检验_返修2_缺陷_浅气泡(B)';
+				}else if(index==86&&column.label=='浅划麻(B)'){
+					propert = '外观检验_返修2_缺陷_浅划麻(B)';
+				}else if(index==87&&column.label=='划麻(返修)'){
+					propert = '外观检验_返修2_缺陷_划麻(返修)';
+				}else if(index==88&&column.label=='浅水纹(B)'){
+					propert = '外观检验_返修2_缺陷_浅水纹(B)';
+				}else if(index==89&&column.label=='重水纹'){
+					propert = '外观检验_返修2_缺陷_重水纹';
+				}else if(index==90&&column.label=='大崩'){
+					propert = '外观检验_返修2_缺陷_大崩';
+				}else if(index==91&&column.label=='小崩边(B)'){
+					propert = '外观检验_返修2_缺陷_小崩边(B)';
+				}else if(index==92&&column.label=='倒角'){
+					propert = '外观检验_返修2_缺陷_倒角';
+				}else if(index==93&&column.label=='棕点'){
+					propert = '外观检验_返修2_缺陷_棕点';
+				}else if(index==94&&column.label=='漏光'){
+					propert = '外观检验_返修2_缺陷_漏光';
+				}else if(index==95&&column.label=='黑圈缺口'){
+					propert = '外观检验_返修2_缺陷_黑圈缺口';
+				}else if(index==96&&column.label=='破损'){
+					propert = '外观检验_返修2_缺陷_破损';
+				}else if(index==97&&column.label=='发白'){
+					propert = '外观检验_返修2_缺陷_发白';
+				}else if(index==98&&column.label=='裂纹'){
+					propert = '外观检验_返修2_缺陷_裂纹';
+				}else if(index==99&&column.label=='光圈'){
+					propert = '外观检验_返修2_缺陷_光圈';
+				}else if(index==100&&column.label=='尺寸小'){
+					propert = '外观检验_返修2_缺陷_尺寸小';
+				}
+				else if(column.label=='外观总合格数'){
+					propert = '外观检验_完全总合格数';
+				}else if(index==105&&column.label=='黑圈变形'){
 					propert = '外观检验_车间库存抽检_缺陷_黑圈变形';
-				}else if(index==84&&column.label=='黑圈缺口'){
+				}else if(index==106&&column.label=='黑圈缺口'){
 					propert = '外观检验_车间库存抽检_缺陷_黑圈缺口';
-				}else if(index==85&&column.label=='光圈'){
+				}else if(index==107&&column.label=='光圈'){
 					propert = '外观检验_车间库存抽检_缺陷_光圈';
-				}else if(index==86&&column.label=='发白'){
+				}else if(index==108&&column.label=='发白'){
 					propert = '外观检验_车间库存抽检_缺陷_发白';
-				}else if(index==87&&column.label=='漏光'){
+				}else if(index==109&&column.label=='漏光'){
 					propert = '外观检验_车间库存抽检_缺陷_漏光';
-				}else if(index==88&&column.label=='抽检不合格'){
+				}else if(index==110&&column.label=='抽检不合格'){
 					propert = '外观检验_车间库存抽检_count_notok';
 				}
 				if (propert!=='') {
@@ -820,7 +865,6 @@ export default {
 							}
 						}, 0);
 					} 
-
 				}
 				if(index==7||index==9||index==11||index==13||index==20||index==24){
 					if(sums[index-1]){
@@ -832,34 +876,24 @@ export default {
 						sums[index] = ((sums[index-1]/sums[28])*100).toFixed(4);
 					}
 				}
-				if(index==79){
-					let sum = 0;
-					if(sums[29]){
-						sum += sums[29];
-					}
-					if(sums[60]){
-						sum += sums[60];
-					}
-					sums[index] = sum;
-				}
-				if(index==80){
-					if(sums[79]&&sums[28]){
-						sums[index] = ((sums[79]/sums[28])*100).toFixed(2);
+				if(index==102){
+					if(sums[101]&&sums[28]){
+						sums[index] = ((sums[101]/sums[28])*100).toFixed(2);
 					}
 				}
-				if(index==81){
-					if(sums[80]&&sums[24]){
-						sums[index] = ((sums[80]*sums[24])/100).toFixed(2);
+				if(index==103){
+					if(sums[102]&&sums[24]){
+						sums[index] = ((sums[102]*sums[24])/100).toFixed(2);
 					}
 				}
-				if(index==89){
-					if(sums[88]&&sums[79]){
-						sums[index] = sums[79]-sums[88];
+				if(index==111){
+					if(sums[110]&&sums[101]){
+						sums[index] = sums[101]-sums[110];
 					}
 				}
-				if(index==90){
-					if(sums[89]&&sums[5]){
-						sums[index] = ((sums[89]/sums[5])*100).toFixed(2);
+				if(index==112){
+					if(sums[111]&&sums[5]){
+						sums[index] = ((sums[111]/sums[5])*100).toFixed(2);
 					}
 				}
 			});