From 51c2a8a4b331d54f453e7124d40ae5b15b68e94f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 16 Jul 2025 16:31:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |   7 +
 src/views/statistics/bxerp/cpccjc.vue     |  82 ++---
 src/views/statistics/bxerp/cpwgfj1.vue    | 132 ++-----
 src/views/statistics/bxerp/cpwgfj2.vue    | 132 ++-----
 src/views/statistics/bxerp/cpwgnzcj.vue   | 418 ++++++----------------
 src/views/statistics/bxerp/cpxnjy.vue     | 190 +++-------
 src/views/statistics/bxerp/cpzj.vue       | 298 ++++-----------
 src/views/statistics/bxerp/fenjian.vue    |  68 ++--
 src/views/statistics/bxerp/maopi.vue      |  45 +--
 src/views/statistics/bxerp/niuzhuan.vue   | 219 +++++-------
 src/views/statistics/bxerp/zhongjian1.vue | 135 +++----
 src/views/statistics/bxerp/zhongjian2.vue | 223 +++---------
 12 files changed, 565 insertions(+), 1384 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 642d8171..36b16a06 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -175,24 +175,31 @@ export default {
 // .el-table thead.is-group th.el-table__cell.colorheader4{
 // 	background-color: rgb(168, 218, 228)!important;
 // }
+.el-table thead th.el-table__cell.colorheader1,
 .el-table thead.is-group th.el-table__cell.colorheader1{
 	background-color: rgba(246, 98, 98, 0.323)!important;
 }
+.el-table thead th.el-table__cell.colorheader2,
 .el-table thead.is-group th.el-table__cell.colorheader2{
 	background-color: rgba(250, 130, 11, 0.325)!important;
 }
+.el-table thead th.el-table__cell.colorheader3,
 .el-table thead.is-group th.el-table__cell.colorheader3{
 	background-color: rgba(247, 235, 9, 0.311)!important;
 }
+.el-table thead th.el-table__cell.colorheader4,
 .el-table thead.is-group th.el-table__cell.colorheader4{
 	background-color: rgba(30, 252, 10, 0.202)!important;
 }
+.el-table thead th.el-table__cell.colorheader5,
 .el-table thead.is-group th.el-table__cell.colorheader5{
 	background-color: rgba(11, 251, 231, 0.326)!important;
 }
+.el-table thead th.el-table__cell.colorheader6,
 .el-table thead.is-group th.el-table__cell.colorheader6{
 	background-color: rgba(12, 85, 255, 0.326)!important;
 }
+.el-table thead th.el-table__cell.colorheader7,
 .el-table thead.is-group th.el-table__cell.colorheader7{
 	background-color: rgba(51, 15, 253, 0.317)!important;
 }
diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue
index 36a0398a..78513dd7 100644
--- a/src/views/statistics/bxerp/cpccjc.vue
+++ b/src/views/statistics/bxerp/cpccjc.vue
@@ -43,78 +43,36 @@
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="垂直度" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.成品尺寸检测_缺陷项_垂直度不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_垂直度不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_垂直度 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="尖角" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品尺寸检测_缺陷项_尖角不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_尖角不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_尖角 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="有效" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品尺寸检测_缺陷项_有效不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_有效不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_有效 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="面型" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品尺寸检测_缺陷项_面型不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_面型不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_面型 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台径小" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品尺寸检测_缺陷项_台径小不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_台径小不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_台径小 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="台径大" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品尺寸检测_缺陷项_台径大不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_台径大不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="台径大" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_台径大 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader2">
+				<el-table-column label="备注" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.成品尺寸检测_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/cpwgfj1.vue b/src/views/statistics/bxerp/cpwgfj1.vue
index ac2313f3..6b508d2b 100644
--- a/src/views/statistics/bxerp/cpwgfj1.vue
+++ b/src/views/statistics/bxerp/cpwgfj1.vue
@@ -42,127 +42,67 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
-					<el-table-column label="差值" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data['成品外观复检一_缺陷项_放大率￠2mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
-					<el-table-column label="差值" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_检测项_放大率16mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['成品外观复检一_缺陷项_放大率￠16mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="剪切￠18.3mm" align="center" class-name="colorheader3">
-					<el-table-column label="剪切" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_检测项_剪切18mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="剪切值" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_检测项_剪切值18mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['成品外观复检一_缺陷项_剪切￠18.3mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="可加工" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['成品外观复检一_缺陷项_剪切￠18.3mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="暗点" align="center" class-name="colorheader4">
-					<el-table-column label="内标合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检一_缺陷项_暗点=='合格'">1</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="长点不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检一_缺陷项_暗点=='不合格'">1</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="可加工" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检一_缺陷项_暗点==''">1</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="暗点重" align="center" class-name="colorheader5">
+				<el-table-column label="划伤" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_暗点重不合格">{{ scope.row.data.成品外观复检一_缺陷项_暗点重不合格 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_缺陷项_划伤 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花丝" align="center" class-name="colorheader5">
+				<el-table-column label="腐蚀" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_花丝不合格">{{scope.row.data.成品外观复检一_缺陷项_花丝不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_腐蚀 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="网格" align="center" class-name="colorheader5">
+				<el-table-column label="崩边" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_网格不合格">{{scope.row.data.成品外观复检一_缺陷项_网格不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_崩边 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花朵" align="center" class-name="colorheader5">
+				<el-table-column label="纹路" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_花朵不合格">{{scope.row.data.成品外观复检一_缺陷项_花朵不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_纹路 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="S畸变" align="center" class-name="colorheader5">
+				<el-table-column label="平台" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_S畸变不合格">{{scope.row.data.成品外观复检一_缺陷项_S畸变不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_平台 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader5">
+				<el-table-column label="硌/坑" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_弓形畸变不合格不合格">{{ scope.row.data.成品外观复检一_缺陷项_弓形畸变不合格不合格 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data['成品外观复检一_缺陷项_硌/坑'] }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="炸废" class-name="colorheader5">
+				<el-table-column label="麻点" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_炸废">{{ scope.row.data.成品外观复检一_缺陷项_炸废 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_缺陷项_麻点 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="角偏" align="center" class-name="colorheader5">
+				<el-table-column label="台阶" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检一_缺陷项_角偏不合格">{{ 1-scope.row.data.成品外观复检一_缺陷项_角偏不合格 }}</span>
+						<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观复检一_缺陷项_台阶 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="出口" align="center" class-name="colorheader6">
-					<el-table-column label="国标" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
-					<el-table-column label="内标" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
-					<el-table-column label="内标放宽" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_柱面 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader2">
+				<el-table-column label="污染" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_污染 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_粗糙度 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="水印" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检一_缺陷项_水印 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检一_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue
index b327b9c9..9322b664 100644
--- a/src/views/statistics/bxerp/cpwgfj2.vue
+++ b/src/views/statistics/bxerp/cpwgfj2.vue
@@ -42,127 +42,67 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
-					<el-table-column label="差值" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data['成品外观复检二_缺陷项_放大率￠2mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
-					<el-table-column label="差值" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_检测项_放大率16mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['成品外观复检二_缺陷项_放大率￠16mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="剪切￠18.3mm" align="center" class-name="colorheader3">
-					<el-table-column label="剪切" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_检测项_剪切18mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="剪切值" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_检测项_剪切值18mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['成品外观复检二_缺陷项_剪切￠18.3mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="可加工" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['成品外观复检二_缺陷项_剪切￠18.3mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="暗点" align="center" class-name="colorheader4">
-					<el-table-column label="内标合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检二_缺陷项_暗点=='合格'">1</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="长点不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检二_缺陷项_暗点=='不合格'">1</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="可加工" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data.成品外观复检二_缺陷项_暗点==''">1</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="暗点重" align="center" class-name="colorheader5">
+				<el-table-column label="划伤" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_暗点重不合格">{{ scope.row.data.成品外观复检二_缺陷项_暗点重不合格 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_缺陷项_划伤 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花丝" align="center" class-name="colorheader5">
+				<el-table-column label="腐蚀" align="center" class-name="colorheader2">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_花丝不合格">{{scope.row.data.成品外观复检二_缺陷项_花丝不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_腐蚀 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="网格" align="center" class-name="colorheader5">
+				<el-table-column label="崩边" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_网格不合格">{{scope.row.data.成品外观复检二_缺陷项_网格不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_崩边 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花朵" align="center" class-name="colorheader5">
+				<el-table-column label="纹路" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_花朵不合格">{{scope.row.data.成品外观复检二_缺陷项_花朵不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_纹路 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="S畸变" align="center" class-name="colorheader5">
+				<el-table-column label="平台" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_S畸变不合格">{{scope.row.data.成品外观复检二_缺陷项_S畸变不合格 }}</span>
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_平台 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader5">
+				<el-table-column label="硌/坑" align="center" class-name="colorheader6">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_弓形畸变不合格不合格">{{ scope.row.data.成品外观复检二_缺陷项_弓形畸变不合格不合格 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data['成品外观复检二_缺陷项_硌/坑'] }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="炸废" class-name="colorheader5">
+				<el-table-column label="麻点" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_炸废">{{ scope.row.data.成品外观复检二_缺陷项_炸废 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_缺陷项_麻点 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="角偏" align="center" class-name="colorheader5">
+				<el-table-column label="台阶" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span v-if="scope.row.data.成品外观复检二_缺陷项_角偏不合格">{{ 1-scope.row.data.成品外观复检二_缺陷项_角偏不合格 }}</span>
+						<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观复检二_缺陷项_台阶 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="出口" align="center" class-name="colorheader6">
-					<el-table-column label="国标" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
-					<el-table-column label="内标" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
-					<el-table-column label="内标放宽" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data"></span>
-						</template>
-					</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_柱面 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader2">
+				<el-table-column label="污染" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_污染 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_粗糙度 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="水印" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.成品外观复检二_缺陷项_水印 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.成品外观复检二_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue
index e019bb03..b28bd749 100644
--- a/src/views/statistics/bxerp/cpwgnzcj.vue
+++ b/src/views/statistics/bxerp/cpwgnzcj.vue
@@ -43,366 +43,156 @@
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.成品外观内置初检_缺陷项_毛坯长点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_毛坯长点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_毛坯长点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="毛坯点多" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_毛坯点多不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_毛坯点多不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_毛坯点多 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="扭后点" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_扭后点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_扭后点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_扭后点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="黑网" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_黑网不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_黑网不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_黑网 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="白网" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_白网不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_白网不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_白网 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="小网" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_小网不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_小网不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_小网 }}</span>
+					</template>
 				</el-table-column>	
 				<el-table-column label="花丝" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_花丝不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_花丝不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_花丝 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="花朵" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_花朵不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_花朵不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_花朵 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="六角" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_六角不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="六角白点" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_六角白点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角白点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角白点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="六角黑点" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_六角黑点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角黑点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_六角黑点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="复丝结构" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_复丝结构不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_复丝结构不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_复丝结构 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="炫光" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_炫光不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_炫光不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_炫光 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="包边丝" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_包边丝不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_包边丝不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_包边丝 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="畸变" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_畸变不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_畸变不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_畸变 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="炸废" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_炸废不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_炸废不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_炸废 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="偏心" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_偏心不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_偏心不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_偏心 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="划伤" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_划伤不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_划伤不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="划伤" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_划伤 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="腐蚀" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_腐蚀不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_腐蚀不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="腐蚀" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_腐蚀 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="崩边" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_崩边不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_崩边不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="崩边" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_崩边 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="纹路" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_纹路不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_纹路不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="纹路" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_纹路 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="平台" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_平台不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_平台不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="平台" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_平台 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="硌/坑" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['成品外观内置初检_缺陷项_硌/坑不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['成品外观内置初检_缺陷项_硌/坑不合格'] }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="硌/坑" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['成品外观内置初检_缺陷项_硌/坑'] }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="麻点" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_麻点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_麻点不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="麻点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_麻点 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="台阶" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_台阶不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_台阶不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="台阶" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_台阶 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="柱面" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_柱面不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_柱面不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_柱面 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="污染" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_污染不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_污染不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="污染" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_污染 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="粗糙度" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_粗糙度不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_粗糙度不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_粗糙度 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="水印" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_水印不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_水印不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="水印" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_水印 }}</span>
+					</template>
 				</el-table-column>	
-				<el-table-column label="角偏" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品外观内置初检_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_角偏 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader7">
+				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.成品外观内置初检_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue
index 4464e7f8..15767f7e 100644
--- a/src/views/statistics/bxerp/cpxnjy.vue
+++ b/src/views/statistics/bxerp/cpxnjy.vue
@@ -42,175 +42,77 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-					<el-table-column label="剪切" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.成品性能检测_缺陷项_剪切不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_剪切不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="剪切" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_剪切 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="分辨率" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_分辨率不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_分辨率不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_分辨率 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="直区" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_直区不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_直区不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_直区 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="S畸变" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_S畸变不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_S畸变不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_S畸变不合格 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="扭转角不合格" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_扭转角不合格不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_扭转角不合格不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_扭转角不合格 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="角偏" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_角偏 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="白边" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_白边不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_白边不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_白边 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="放大率" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_放大率不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_放大率不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_放大率 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="复丝阴影" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_复丝阴影不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_复丝阴影不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_复丝阴影 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="灰边" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_灰边不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_灰边不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_灰边 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="气密性" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_气密性不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_气密性不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_气密性 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="像位移" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_像位移不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_像位移不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="像位移不合格" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_像位移不合格 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="垂直度" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_垂直度不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_垂直度不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_垂直度 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="角尖" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.成品性能检测_缺陷项_角尖不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_角尖不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_角尖 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader2">
+				<el-table-column label="备注" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.成品性能检测_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue
index b6cf108f..6e057db6 100644
--- a/src/views/statistics/bxerp/cpzj.vue
+++ b/src/views/statistics/bxerp/cpzj.vue
@@ -43,270 +43,116 @@
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="腐蚀A" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.中检二_缺陷项_腐蚀A不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_腐蚀A不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_腐蚀A }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="亮道" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_亮道不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_亮道不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_亮道 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面坑" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面坑不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面坑不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面坑 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="小面坑" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_小面坑不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小面坑不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小面坑 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台划" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_台划不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台划不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台划 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台高" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_台高不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台高不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台高 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="倒角麻" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_倒角麻不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_倒角麻不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_倒角麻 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_台不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_台 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="大外划硌" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_大外划硌不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_大外划硌不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_大外划硌 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="炸" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_炸不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_炸不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_炸 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="崩废" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_崩废不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_崩废不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_崩废 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="小崩" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_小崩不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小崩不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小崩 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="总厚" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_总厚不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_总厚不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_总厚 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="前角崩" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_前角崩不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前角崩不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前角崩 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="小柱划" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_小柱划不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小柱划不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小柱划 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="前小柱划" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_前小柱划不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前小柱划不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前小柱划 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="前角麻" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_前角麻不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前角麻不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前角麻 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="平麻" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_平麻不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_平麻不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="平麻" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_平麻 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="圆角划" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_圆角划不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角划不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="圆角划" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角划 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="平面划" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_平面划不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_平面划不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="平面划" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_平面划 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="小面硌" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_小面硌不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小面硌不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="小面硌" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_小面硌 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="前台崩" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_前台崩不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前台崩不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="前台崩" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_前台崩 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader7">
+				<el-table-column label="备注" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue
index a80915e6..9ecbab69 100644
--- a/src/views/statistics/bxerp/fenjian.vue
+++ b/src/views/statistics/bxerp/fenjian.vue
@@ -48,9 +48,9 @@
 							<span v-if="scope.row.data">{{ scope.row.data.分检_检测项_S畸变 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader1">
+					<el-table-column label="不合格数" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data['分检_缺陷项_S畸变不合格'] }}</span>
+							<span v-if="scope.row.data">{{scope.row.data.分检_缺陷项_S畸变不合格 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -60,61 +60,33 @@
 							<span v-if="scope.row.data">{{ scope.row.data.分检_检测项_像位移 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader2">
+					<el-table-column label="不合格数" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['分检_缺陷项_像位移不合格'] }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_像位移不合格 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="放大率" align="center" class-name="colorheader3">
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_放大率不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.分检_缺陷项_放大率不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_炸废 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="扭转角" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.分检_缺陷项_扭转角不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{scope.row.data.分检_缺陷项_扭转角不合格}}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="放大率" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_放大率 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="角偏" align="center" class-name="colorheader5">
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.分检_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_角偏 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="炸废" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.分检_缺陷项_炸废不合格}}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_炸废不合格 }}</span>
-						</template>
-					</el-table-column>
+				<el-table-column label="扭转角不合格" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{scope.row.data.分检_缺陷项_扭转角不合格}}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader7">
+				<el-table-column label="备注" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.分检_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index fc5a85fd..8645ffbc 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
@@ -12,24 +12,6 @@
 					clearable 
 					style="width: 200px;"
 				></el-input>
-				<!-- <el-date-picker
-					v-model="query.last_time__gte"
-					type="datetime"
-					placeholder="变动时间起"
-					value-format="YYYY-MM-DD HH:mm:ss"
-					clearable
-					style="width: 200px; margin: 5px"
-				>
-				</el-date-picker>
-				<el-date-picker
-					v-model="query.last_time__lte"
-					type="datetime"
-					placeholder="变动时间止"
-					value-format="YYYY-MM-DD HH:mm:ss"
-					clearable
-					style="width: 200px; margin:0"
-				>
-				</el-date-picker> -->
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -39,8 +21,7 @@
 					@click="handleExport"
 					class="tables"
 					type="primary"
-					>导出</el-button
-				>
+				>导出</el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -66,9 +47,9 @@
 							<span v-if="scope.row.data">{{ scope.row.data.毛坯检测_检测项_放大率2mm }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader1">
+					<el-table-column label="不合格数" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data['毛坯检测_缺陷项_放大率￠2mm不合格'] }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data['毛坯检测_缺陷项_放大率￠2mm不合格'] }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -78,9 +59,9 @@
 							<span v-if="scope.row.data">{{ scope.row.data.毛坯检测_检测项_放大率16mm }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader2">
+					<el-table-column label="不合格数" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格'] }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格'] }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -128,32 +109,32 @@
 						<span v-if="scope.row.data.毛坯检测_缺陷项_暗点重不合格">{{ scope.row.data.毛坯检测_缺陷项_暗点重不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花丝" align="center" class-name="colorheader5">
+				<el-table-column label="花丝" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_花丝不合格">{{scope.row.data.毛坯检测_缺陷项_花丝不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="网格" align="center" class-name="colorheader5">
+				<el-table-column label="网格" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_网格不合格">{{scope.row.data.毛坯检测_缺陷项_网格不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花朵" align="center" class-name="colorheader5">
+				<el-table-column label="花朵" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_花朵不合格">{{scope.row.data.毛坯检测_缺陷项_花朵不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="S畸变" align="center" class-name="colorheader5">
+				<el-table-column label="S畸变" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_S畸变不合格">{{scope.row.data.毛坯检测_缺陷项_S畸变不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader5">
+				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_弓形畸变不合格不合格">{{ scope.row.data.毛坯检测_缺陷项_弓形畸变不合格不合格 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="炸废" class-name="colorheader5">
+				<el-table-column label="炸废" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span v-if="scope.row.data.毛坯检测_缺陷项_炸废">{{ scope.row.data.毛坯检测_缺陷项_炸废 }}</span>
 					</template>
@@ -180,7 +161,7 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader2">
+				<el-table-column label="备注" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.毛坯检测_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue
index 02fc6985..aeadd709 100644
--- a/src/views/statistics/bxerp/niuzhuan.vue
+++ b/src/views/statistics/bxerp/niuzhuan.vue
@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
@@ -12,24 +12,6 @@
 					clearable 
 					style="width: 200px;"
 				></el-input>
-				<!-- <el-date-picker
-					v-model="query.last_time__gte"
-					type="datetime"
-					placeholder="变动时间起"
-					value-format="YYYY-MM-DD HH:mm:ss"
-					clearable
-					style="width: 200px; margin: 5px"
-				>
-				</el-date-picker>
-				<el-date-picker
-					v-model="query.last_time__lte"
-					type="datetime"
-					placeholder="变动时间止"
-					value-format="YYYY-MM-DD HH:mm:ss"
-					clearable
-					style="width: 200px; margin:0"
-				>
-				</el-date-picker> -->
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -62,147 +44,116 @@
 				</el-table-column>
 				<el-table-column label="炉号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="扭后内质" align="center" class-name="colorheader1">
-					<el-table-column label="可加工" class-name="colorheader1">
-						<el-table-column label="合格" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="可加工" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{1- scope.row.data['扭后检测_缺陷项_放大率￠2mm不合格'] }}</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<el-table-column label="长点" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="大点" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{1- scope.row.data['扭后检测_缺陷项_放大率￠2mm不合格'] }}</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="黑网" align="center" class-name="colorheader2">
-					<el-table-column label="无" class-name="colorheader2">
+				<el-table-column label="扭转角" align="center" class-name="colorheader1">
+					<el-table-column label="差值" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率16mm }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_扭转角 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="轻" class-name="colorheader2">
+					<el-table-column label="不合格数" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="重" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
+							<span v-if="scope.row.data">{{scope.row.data.扭后检测_缺陷项_扭转角不合格 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="白网" align="center" class-name="colorheader3">
-					<el-table-column label="无" class-name="colorheader3">
+				<el-table-column label="暗点" align="center" class-name="colorheader2">
+					<el-table-column label="内标合格" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率16mm }}</span>
+							<span v-if="scope.row.data.毛坯检测_检测项_暗点=='合格'">1</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="轻" class-name="colorheader3">
+					<el-table-column label="长点不合格" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
+							<span v-if="scope.row.data.毛坯检测_检测项_暗点=='不合格'">1</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="重" class-name="colorheader3">
+					<el-table-column label="可加工" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
+							<span v-if="scope.row.data.毛坯检测_检测项_暗点==''">1</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="小网" align="center" class-name="colorheader4">
-					<el-table-column label="无" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率16mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="轻" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="重" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['扭后检测_缺陷项_放大率￠16mm不合格'] }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="分辨率" align="center" class-name="colorheader5">
-					<el-table-column label="国内" class-name="colorheader5">
-						<el-table-column label="合格" class-name="colorheader5">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="可加工" class-name="colorheader5">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{1- scope.row.data['扭后检测_缺陷项_放大率￠2mm不合格'] }}</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="出口" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="断丝" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="炸裂" align="center" class-name="colorheader6">
-					<el-table-column label="可加工" class-name="colorheader6">
-						<el-table-column label="完好" class-name="colorheader6">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="崩炸" class-name="colorheader6">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{1- scope.row.data['扭后检测_缺陷项_放大率￠2mm不合格'] }}</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="炸废" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.扭后检测_检测项_放大率2mm }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="扭转角合格数" align="center" class-name="colorheader7">
+				<el-table-column label="黑网轻" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span v-if="scope.row.扭后检测_缺陷项_花丝不合格">{{scope.row.扭后检测_countok }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.扭后检测_缺陷项_黑网轻 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="加工数" align="center" class-name="colorheader1">
+				<el-table-column label="黑网重" align="center" class-name="colorheader4">
 					<template #default="scope">
-						<span v-if="scope.row.data.扭后检测_count_use">{{scope.row.data.扭后检测_count_use }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.扭后检测_缺陷项_黑网重 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="外形偏" align="center" class-name="colorheader2">
+				<el-table-column label="白网轻" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span v-if="scope.row.data.扭后检测_缺陷项_外形偏不合格">{{scope.row.data.扭后检测_缺陷项_外形偏不合格 }}</span>
+						<span v-if="scope.row.data">{{ scope.row.data.扭后检测_缺陷项_白网轻 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader3">
+				<el-table-column label="白网重" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.扭后检测_缺陷项_白网重 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="小网轻" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.扭后检测_缺陷项_小网轻">{{scope.row.扭后检测_缺陷项_小网轻 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="小网重" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.扭后检测_缺陷项_小网重">{{scope.row.扭后检测_缺陷项_小网重 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="扭后炸废" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_扭后炸废">{{scope.row.data.扭后检测_缺陷项_扭后炸废 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="扭后炸纹" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_扭后炸纹">{{scope.row.data.扭后检测_缺陷项_扭后炸纹 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="分辨率" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_分辨率">{{scope.row.data.扭后检测_缺陷项_分辨率 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_S畸变不合格">{{scope.row.data.扭后检测_缺陷项_S畸变不合格 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_弓形畸变不合格">{{scope.row.data.扭后检测_缺陷项_弓形畸变不合格 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_角偏">{{scope.row.data.扭后检测_缺陷项_角偏 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="花丝" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_花丝">{{scope.row.data.扭后检测_缺陷项_花丝 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="暗点重" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_暗点重">{{scope.row.data.扭后检测_缺陷项_暗点重 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="暗点合格" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_暗点合格">{{scope.row.data.扭后检测_缺陷项_暗点合格 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="高差" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data.扭后检测_缺陷项_高差">{{scope.row.data.扭后检测_缺陷项_高差 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span v-if="scope.row.扭后检测_备注">{{scope.row.扭后检测_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue
index 0d3caaf3..f829db4d 100644
--- a/src/views/statistics/bxerp/zhongjian1.vue
+++ b/src/views/statistics/bxerp/zhongjian1.vue
@@ -43,78 +43,91 @@
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="台阶划伤" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.中检一_缺陷项_台阶划伤不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台阶划伤不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台阶划伤 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="柱面划伤" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检一_缺陷项_柱面划伤不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_柱面划伤不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_柱面划伤 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台棱" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检一_缺陷项_台棱不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台棱不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台棱 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="台糙" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检一_缺陷项_台糙不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台糙不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_台糙 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="外黑" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检一_缺陷项_外黑不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_外黑不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_外黑 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="尺寸大/小" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['中检一_缺陷项_尺寸大/小不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['中检一_缺陷项_尺寸大/小不合格'] }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['中检一_缺陷项_尺寸大/小'] }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader7">
+				<el-table-column label="拆头" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_拆头 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="外磕" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_外磕 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="掉头" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_掉头 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="打毛/打台" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['中检一_缺陷项_打毛/打台'] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="量崩" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_量崩 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="崩" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_崩 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="喷码" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_喷码 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="修崩/炸" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['中检一_缺陷项_修崩/炸'] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_炸 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="偏" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_偏 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="掉皮" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_掉皮 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.中检一_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue
index d5d8a07f..bde97d83 100644
--- a/src/views/statistics/bxerp/zhongjian2.vue
+++ b/src/views/statistics/bxerp/zhongjian2.vue
@@ -43,210 +43,91 @@
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
 				<el-table-column label="炸废" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{1- scope.row.data.中检二_缺陷项_炸废不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_炸废不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_炸废 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="崩" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_崩不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_崩不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_崩 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="划伤少" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_划伤少不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_划伤少不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_划伤少 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="划伤多" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_划伤多不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_划伤多不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_划伤多 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="斜角/圆角" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['中检二_缺陷项_斜角/圆角不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['中检二_缺陷项_斜角/圆角不合格'] }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['中检二_缺陷项_斜角/圆角'] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="角偏" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_角偏不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_角偏 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="圆角划伤" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_圆角划伤不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角划伤不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角划伤 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="圆角抛小" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_圆角抛小不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角抛小不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角抛小 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="圆角高亮" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_圆角高亮不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角高亮不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角高亮 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="圆角麻点" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_圆角麻点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角麻点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_圆角麻点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="圆角没抛到/抛光尺寸不足" align="center" class-name="colorheader4">
-					<el-table-column label="合格数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data['中检二_缺陷项_圆角没抛到/抛光尺寸不足不合格'] }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data['中检二_缺陷项_圆角没抛到/抛光尺寸不足不合格'] }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data['中检二_缺陷项_圆角没抛到/抛光尺寸不足'] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面偏" align="center" class-name="colorheader5">
-					<el-table-column label="合格数" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面偏不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面偏不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面偏 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面炸废" align="center" class-name="colorheader6">
-					<el-table-column label="合格数" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面炸废不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader6">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面炸废不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面炸废 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面崩边" align="center" class-name="colorheader7">
-					<el-table-column label="合格数" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面崩边不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader7">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面崩边不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面崩边 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面划伤" align="center" class-name="colorheader1">
-					<el-table-column label="合格数" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面划伤不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader1">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面划伤不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面划伤 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面麻点" align="center" class-name="colorheader2">
-					<el-table-column label="合格数" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面麻点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader2">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面麻点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面麻点 }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="凹面硌点" align="center" class-name="colorheader3">
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ 1-scope.row.data.中检二_缺陷项_凹面硌点不合格 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面硌点不合格 }}</span>
-						</template>
-					</el-table-column>
+					<template #default="scope">
+						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_凹面硌点 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="备注" class-name="colorheader7">
+				<el-table-column label="备注" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span v-if="scope.row.data">{{ scope.row.data.中检二_缺陷项_备注 }}</span>
 					</template>