diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue
index fd53568d..7a5d3259 100644
--- a/src/views/statistics/bxerp/defect.vue
+++ b/src/views/statistics/bxerp/defect.vue
@@ -39,21 +39,50 @@
 				</el-table-column>
                 <el-table-column label="员工" prop="员工">
 				</el-table-column>
-				<el-table-column label="总数" prop="总生产数">
+				<el-table-column label="总数">
+					<template #default="scope">
+						<span v-if="scope.row.总生产数">{{ scope.row.总生产数 }}</span>
+						<span v-if="scope.row.总切片数">{{ scope.row.总切片数 }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="剪切" prop="剪切">
+				<el-table-column label="剪切">
+					<template #default="scope">
+						<span v-if="scope.row.剪切合格">{{((scope.row.剪切合格/scope.row.总切片数)*100).toFixed(2) }}%</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="剪切加功率" prop="剪切加功率">
+				<el-table-column label="剪切加功率">
+					<template #default="scope">
+						<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'])/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span v-else>100%</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="暗点" prop="暗点不合格">
+				<el-table-column label="暗点">
+					<template #default="scope">
+						<span v-if="scope.row.暗点合格">{{((scope.row.暗点合格/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span v-else>0%</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="长点率" prop="长点率">
+				<el-table-column label="长点率">
+					<template #default="scope">
+						<span v-if="scope.row.暗点不合格">{{((scope.row.暗点不合格/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span v-else>0%</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="加功率" prop="加功率">
+				<el-table-column label="加功率">
+					<template #default="scope">
+						<span v-if="scope.row.可加工数">{{((scope.row.可加工数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="不合格数" prop="不合格数">
+				<el-table-column label="不合格数">
+					<template #default="scope">
+						<span v-if="scope.row.不合格数">{{((scope.row.不合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="合格率" prop="合格率">
+					<template #default="scope">
+						<span v-if="scope.row['剪切￠18.3mm可加工']">{{ scope.row['剪切￠18.3mm不合格']?scope.row.总切片数 - scope.row['剪切￠18.3mm可加工']- scope.row['剪切￠18.3mm不合格']+scope.row.暗点合格:scope.row.总切片数 - scope.row['剪切￠18.3mm可加工']+scope.row.暗点合格}}</span>
+						<span v-else>{{ scope.row['剪切￠18.3mm不合格']?scope.row.总切片数 - scope.row['剪切￠18.3mm不合格']+scope.row.暗点合格:scope.row.总切片数}}</span>
+					</template>
 				</el-table-column>
 			</scTable>
 		</el-main>
@@ -101,12 +130,37 @@ export default {
 							item[key]=defect[key];
 						}
 					}
-				})
-				data.forEach(item=>{
-					if(item.暗点不合格){
-						item.长点率 = (item.暗点不合格/item.总生产数*100).toFixed(2)+'%';
+					item.不合格数 = 0;
+					item.可加工数 = 0;
+					if(item['剪切￠18.3mm不合格']){
+						if(item['剪切￠18.3mm可加工']){
+							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工']- item['剪切￠18.3mm不合格'];
+						}else{
+							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格'];
+						}
+						if(item.暗点不合格){
+							item.不合格数 = item['剪切￠18.3mm不合格'] + item.暗点不合格;
+							item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格'] - item.暗点不合格;
+						}else{
+							item.不合格数 = item['剪切￠18.3mm不合格'];
+							item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格'];
+						}
+					}else{
+						if(item['剪切￠18.3mm可加工']){
+							item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'];
+						}else{
+							item.剪切合格 = item.总切片数;
+						}
+						if(item.暗点不合格){
+							item.不合格数 = item.暗点不合格;
+							item.可加工数 = item.总切片数 - item.暗点不合格;
+						}else{
+							item.不合格数 = 0;
+							item.可加工数 = item.总切片数;
+						}
 					}
 				})
+				
 				console.log('data',data)
 				that.tableData = data;
 			});