diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index 78e5d71a..8b3fc178 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -92,17 +92,17 @@
 				<el-table-column label="暗点" align="center" class-name="colorheader4">
 					<el-table-column label="内标合格" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{scope.row.data.毛坯检测_检测项_暗点合格?scope.row.data.毛坯检测_检测项_暗点合格:0 }}</span>
+							<span>{{scope.row.data.毛坯检测_缺陷项_暗点合格?scope.row.data.毛坯检测_缺陷项_暗点合格:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点不合格" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{scope.row.data.毛坯检测_检测项_暗点不合格?scope.row.data.毛坯检测_检测项_暗点不合格:0 }}</span>
+							<span>{{scope.row.data.毛坯检测_缺陷项_暗点不合格?scope.row.data.毛坯检测_缺陷项_暗点不合格:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="可加工" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ !scope.row.data.毛坯检测_检测项_暗点合格&&!scope.row.data.毛坯检测_检测项_暗点不合格?1:0 }}</span>
+							<span>{{ !scope.row.data.毛坯检测_缺陷项_暗点合格&&!scope.row.data.毛坯检测_缺陷项_暗点不合格?1:0 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -251,13 +251,13 @@ export default {
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
 				}
 				if(index == 11&&column.label=='内标合格'){
-					propert= '毛坯检测_检测项_暗点合格';
+					propert= '毛坯检测_缺陷项_暗点合格';
 				}
 				if(index == 12&&column.label=='长点不合格'){
-					propert= '毛坯检测_检测项_暗点不合格';
+					propert= '毛坯检测_缺陷项_暗点不合格';
 				}
 				if(index == 13&&column.label=='可加工'){
-					propert= '毛坯检测_检测项_暗点合格';
+					propert= '毛坯检测_缺陷项_暗点合格';
 				}
 				if(index == 14&&column.label=='暗点重'){
 					propert= '毛坯检测_缺陷项_暗点重';
diff --git a/src/views/statistics/bxerp/maopiTotal.vue b/src/views/statistics/bxerp/maopiTotal.vue
index 000225df..5e7dc0e6 100644
--- a/src/views/statistics/bxerp/maopiTotal.vue
+++ b/src/views/statistics/bxerp/maopiTotal.vue
@@ -51,7 +51,7 @@
 							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader1">
+					<el-table-column label="比率" class-name="colorheader1">
 						<template #default="scope">
 							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
 						</template>
@@ -63,7 +63,7 @@
 							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader2">
+					<el-table-column label="比率" class-name="colorheader2">
 						<template #default="scope">
 							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
 						</template>
@@ -83,7 +83,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader3">
+					<el-table-column label="比率" class-name="colorheader3">
 						<template #default="scope">
 							<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']">
 								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}</span>
@@ -100,7 +100,7 @@
 							<span>{{ scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']:0 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="加工率" class-name="colorheader3">
+					<el-table-column label="比率" class-name="colorheader3">
 						<template #default="scope">
 							<span>{{  scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
 						</template>
@@ -109,12 +109,12 @@
 				<el-table-column label="暗点" align="center" class-name="colorheader4">
 					<el-table-column label="内标数" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_含缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点合格?scope.row.data.毛坯检测_含缺陷_暗点合格:0 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader4">
+					<el-table-column label="比率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点合格_比例?scope.row.data.毛坯检测_含缺陷_暗点合格_比例:0 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点数" class-name="colorheader4">
@@ -127,53 +127,154 @@
 							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:0 }}%</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="可加工" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.毛坯检测_含缺陷_暗点合格">{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use - scope.row.data.毛坯检测_含缺陷_暗点不合格 - scope.row.data.毛坯检测_含缺陷_暗点合格:scope.row.data.毛坯检测_count_use - scope.row.data.毛坯检测_含缺陷_暗点合格}}</span>
+							<span v-else>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use - scope.row.data.毛坯检测_含缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.毛坯检测_含缺陷_暗点合格_比例">{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例-scope.row.data.毛坯检测_含缺陷_暗点合格_比例:100-scope.row.data.毛坯检测_含缺陷_暗点合格_比例 }}</span>
+							<span v-else>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</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="colorheader5">
+				<el-table-column label="暗点重" align="center" class-name="colorheader5">
+					<el-table-column label="数量" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_崩?scope.row.data.毛坯检测_含缺陷_崩:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点重?scope.row.data.毛坯检测_含缺陷_暗点重:0 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" align="center" class-name="colorheader5">
+					<el-table-column label="比率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_崩_比例?100-scope.row.data.毛坯检测_含缺陷_崩_比例:100 }}%</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点重_比例?scope.row.data.毛坯检测_含缺陷_暗点重_比例:0 }}%</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="炸废" align="center" class-name="colorheader5">
+				</el-table-column>
+				<el-table-column label="花丝" align="center" class-name="colorheader6">
+					<el-table-column label="数量" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_花丝?scope.row.data.毛坯检测_含缺陷_花丝:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_花丝_比例?scope.row.data.毛坯检测_含缺陷_花丝_比例:0 }}%</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="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_网格?scope.row.data.毛坯检测_含缺陷_网格:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_网格_比例?scope.row.data.毛坯检测_含缺陷_网格_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花朵" align="center" class-name="colorheader1">
+					<el-table-column label="轻数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_花朵轻?scope.row.data.毛坯检测_含缺陷_花朵轻:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{  scope.row.data.毛坯检测_含缺陷_花朵轻_比例?scope.row.data.毛坯检测_含缺陷_花朵轻_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="重数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_花朵重?scope.row.data.毛坯检测_含缺陷_花朵重:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{  scope.row.data.毛坯检测_含缺陷_花朵重_比例?scope.row.data.毛坯检测_含缺陷_花朵重_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader2">
+					<el-table-column label="数量" align="center" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_S畸变不合格?scope.row.data.毛坯检测_含缺陷_S畸变不合格:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例?scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader3">
+					<el-table-column label="数量" align="center" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_弓形畸变不合格?scope.row.data.毛坯检测_含缺陷_弓形畸变不合格:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例?scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader4">
+					<el-table-column label="数量" align="center" class-name="colorheader4">
 						<template #default="scope">
 							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废?scope.row.data.毛坯检测_含缺陷_炸废:0 }}</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>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?100-scope.row.data.毛坯检测_含缺陷_炸废_比例:100 }}%</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?scope.row.data.毛坯检测_含缺陷_炸废_比例:0 }}%</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="角偏" align="center" class-name="colorheader5">
+					<el-table-column label="数量" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_count_ok }} </span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_角偏?scope.row.data.毛坯检测_含缺陷_角偏:0 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader6">
+					<el-table-column label="比率" align="center" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_角偏_比例?scope.row.data.毛坯检测_含缺陷_角偏_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="色差" align="center" class-name="colorheader6">
+					<el-table-column label="数量" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_色差?scope.row.data.毛坯检测_含缺陷_色差:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_色差_比例?scope.row.data.毛坯检测_含缺陷_色差_比例:0 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="总加工数" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="合格率" class-name="colorheader7">
 						<template #default="scope">
 							<span>{{ scope.row.data.毛坯检测_合格率 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="长点试加工数" align="center" class-name="colorheader7">
+				<el-table-column label="长点试加工数" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1">
-				</el-table-column>
-				<!-- <el-table-column label="备注" align="center" class-name="colorheader3">
-					<template #default="scope">
-						<span>{{ scope.row.data.毛坯检测_含缺陷_备注 }}</span>
-					</template>
-				</el-table-column> -->
 			</scTable>
 		</el-main>
 	</el-container>