diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue
index 303550d9..d8ee4e5b 100644
--- a/src/views/home/widgets/index_photon.vue
+++ b/src/views/home/widgets/index_photon.vue
@@ -25,7 +25,7 @@
 							</div>
 							<div style="padding-top: 20px; display: flex">
 								<div class="countItem">
-									<div class="countname">预制棒合格数</div>
+									<div class="countname">昨日预制棒合格数</div>
 									<p class="countnum">{{ dayPassNum7 }}</p>
 									<p class="countrate">
 										同比前天
@@ -37,7 +37,7 @@
 									</p>
 								</div>
 								<div class="countItem">
-									<div class="countname">预制管合格数</div>
+									<div class="countname">昨日预制管合格数</div>
 									<p class="countnum">{{ dayPassNum10 }}</p>
 									<p class="countrate">
 										同比前天
@@ -49,7 +49,7 @@
 									</p>
 								</div>
 								<div class="countItem">
-									<div class="countname">预制棒管交付数</div>
+									<div class="countname">昨日预制棒管交付数</div>
 									<p class="countnum">{{ dayPayNum6 }}</p>
 									<p class="countrate">
 										同比前天
@@ -72,7 +72,7 @@
 							</div>
 							<div style="padding-top: 20px; display: flex">
 								<div class="countItem">
-									<div class="countname">预制棒管 </div>
+									<div class="countname">本月预制棒管 </div>
 									<p class="countnum">{{ monthPayNum6 }}</p>
 									<div class="countrate">本月累积交付数</div>
 								</div>
@@ -84,7 +84,7 @@
 										:percentage="monthPassRate7"
 									/>
 									<div style="margin-left: 20px">
-										<div class="countname">预制棒合格率</div>
+										<div class="countname">本月预制棒合格率</div>
 										<p class="countnum" style="line-height: 82px">
 											{{ monthPassRate7 }}%
 										</p>
@@ -98,7 +98,7 @@
 										:percentage="monthPassRate10"
 									/>
 									<div style="margin-left: 20px">
-										<div class="countname">预制管合格率</div>
+										<div class="countname">本月预制管合格率</div>
 										<p class="countnum" style="line-height: 82px">
 											{{ monthPassRate10 }}%
 										</p>
@@ -148,8 +148,8 @@
 					<div class="retangleWrap retangleWrapTable">
 						<div class="retangle tableRetangle">
 							<div class="Retangle_container">
-								<div class="title">库存情况</div>
-								<div class="radios_group">
+								<div class="title">成品库存统计</div>
+								<!-- <div class="radios_group">
 									<el-radio-group
 										v-model="materialType"
 										@change="materialTypeChange"
@@ -157,7 +157,7 @@
 										<el-radio label="20">半成品</el-radio>
 										<el-radio label="10">成品</el-radio>
 									</el-radio-group>
-								</div>
+								</div> -->
 							</div>
 							<div style="padding: 20px 24px 24px 24px">
 								<el-table
@@ -537,20 +537,20 @@ export default {
 			let obj = {query: {material_types: "10"}};
 			that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
 				if (res.data2.ds0) {
-					console.log("getHalfProductList", res);
+					console.log("getProductList", res);
 					that.productList = res.data2.ds0;
 					that.tableData = res.data2.ds0;
 				}
 			});
 		},
-		materialTypeChange() {
-			let that = this;
-			if(that.materialType==10){
-				this.getProductList();
-			}else{
-				this.getHalfProductList();
-			}
-		},
+		// materialTypeChange() {
+		// 	let that = this;
+		// 	if(that.materialType==10){
+		// 		this.getProductList();
+		// 	}else{
+		// 		this.getHalfProductList();
+		// 	}
+		// },
 		//获取库存
 		getMaterialList() {
 			let that = this;
diff --git a/src/views/statistics/product_check.vue b/src/views/statistics/product_check.vue
index e233ab6e..8d2ec62a 100644
--- a/src/views/statistics/product_check.vue
+++ b/src/views/statistics/product_check.vue
@@ -231,8 +231,12 @@
 								</el-table-column>
 								<el-table-column label="气线" prop="气线">
 								</el-table-column>
+								<el-table-column label="划伤" prop="划伤">
+								</el-table-column>
 								<el-table-column label="箱中破" prop="箱中破">
 								</el-table-column>
+								<el-table-column label="退火后碎" prop="退火后碎">
+								</el-table-column>
 								<el-table-column label="合计" prop="不合格数">
 								</el-table-column>
 							</el-table-column>
@@ -359,6 +363,8 @@ export default {
 						{ value: 0, name: "结石" },
 						{ value: 0, name: "气线" },
 						{ value: 0, name: "箱中破" },
+						{ value: 0, name: "退火后碎" },
+						{ value: 0, name: "划伤" },
 					],
 				},
 			},
@@ -468,6 +474,8 @@ export default {
 					that.option3.series.data[6].value=0;
 					that.option3.series.data[7].value=0;
 					that.option3.series.data[8].value=0;
+					that.option3.series.data[9].value=0;
+					that.option3.series.data[10].value=0;
 					let data = res2.data2.ds0;
 					if (data.length > 0) {
 						data.forEach((item) => {
@@ -480,6 +488,8 @@ export default {
 							that.option3.series.data[6].value += item.结石;
 							that.option3.series.data[7].value += item.气线;
 							that.option3.series.data[8].value += item.箱中破;
+							that.option3.series.data[9].value += item.退火后碎;
+							that.option3.series.data[10].value += item.划伤;
 						});
 					}
 				}
diff --git a/src/views/statistics/product_check2.vue b/src/views/statistics/product_check2.vue
index 875bd9c2..f4f330b0 100644
--- a/src/views/statistics/product_check2.vue
+++ b/src/views/statistics/product_check2.vue
@@ -211,9 +211,21 @@
 						];
 						if (data.length > 0) { 
 							data.forEach((item) => {
-							    seriesData.forEach((item2) => {
-							        item2.value += item[item2.name];
-							    })
+								let other_count = item.不合格数 - item.条纹 - item.气泡 - item.断裂 - item.气线 - item.炸纹 - item.结石 - item.弯曲 - item.偏壁 - item.大小头;
+								seriesData[0].value += item.合格数;
+								seriesData[1].value += item.条纹;
+								seriesData[2].value += item.气泡;
+								seriesData[3].value += item.断裂;
+								seriesData[4].value += item.气线;
+								seriesData[5].value += item.炸纹;
+								seriesData[6].value += item.结石;
+								seriesData[7].value += item.弯曲;
+								seriesData[8].value += item.偏壁;
+								seriesData[9].value += item.大小头;
+								seriesData[10].value += other_count;
+							    // seriesData.forEach((item2) => {
+							    //     item2.value += item[item2.name];
+							    // })
 							})
 						}
 						that.option1.series[0].data = seriesData;
@@ -229,8 +241,12 @@
 				};
 				//获取table数据
 				that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
-					that.tableData = res2.data2.ds0;
 					let data = res2.data2.ds0;
+					data.forEach((item) => {
+					    let other_count = item.不合格数 - item.条纹 - item.气泡 - item.断裂 - item.气线 - item.炸纹 - item.结石 - item.弯曲 - item.偏壁 - item.大小头;
+						item.其他 = other_count;
+					})
+					that.tableData = res2.data2.ds0;
 					data.forEach((item) => {
 						let date =item.年;
 						if(that.queryType=='月'){
diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index faca775f..f89f86a6 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -55,10 +55,6 @@
 								<span v-if="scope.row.data">{{ scope.row.data.产品规格 }}</span>
 							</template>
 						</el-table-column>
-						<!-- <el-table-column label="实际重量/KG" class-name="colorheader2">
-						</el-table-column>
-						<el-table-column label="合格重量/KG" class-name="colorheader2">
-						</el-table-column> -->
 						<el-table-column label="应出数" class-name="colorheader2">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_real }}</span>
@@ -71,7 +67,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" 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.棒料成型_合格率">{{ scope.row.data.棒料成型_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="炸纹" class-name="colorheader2">
@@ -143,7 +139,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" 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.七车间入库_合格率">{{ scope.row.data.七车间入库_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="炸纹" class-name="colorheader3">
@@ -204,110 +200,110 @@
 							</template>
 						</el-table-column>
 						<!-- 平头 -->
-						<el-table-column label="平头" class-name="colorheader4">
-							<el-table-column label="接收数" class-name="colorheader4">
+						<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.六车间_平头_count_real }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不合格数" class-name="colorheader4">
+							<el-table-column label="不合格数" class-name="colorheader1">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_notok }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="合格率" class-name="colorheader4">
+							<el-table-column label="合格率" 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.六车间_平头_合格率">{{ scope.row.data.六车间_平头_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							
-							<el-table-column label="加工日期" class-name="colorheader4" min-width="160">
+							<el-table-column label="加工日期" class-name="colorheader1" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_日期 }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="操作人" class-name="colorheader4">
+							<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>
 						<!-- 粘头接收数 -->
-						<el-table-column label="粘头" class-name="colorheader4">
-							<el-table-column label="接收数" class-name="colorheader4">
+						<el-table-column label="粘头" class-name="colorheader2">
+							<el-table-column label="接收数" class-name="colorheader2">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_use }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="合格率" class-name="colorheader4">
+							<el-table-column label="合格率" 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.六车间_粘铁头_合格率">{{ scope.row.data.六车间_粘铁头_合格率 }}%</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不合格数" class-name="colorheader4">
+							<el-table-column label="不合格数" class-name="colorheader2">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_notok }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="加工日期" class-name="colorheader4" min-width="160">
+							<el-table-column label="加工日期" class-name="colorheader2" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_日期 }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="操作人" class-name="colorheader4">
+							<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>
 						<!-- 粗中细接收数 -->
-						<el-table-column label="粗中细" class-name="colorheader4">
-							<el-table-column label="接收数" class-name="colorheader4">
+						<el-table-column label="粗中细" class-name="colorheader3">
+							<el-table-column label="接收数" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_use }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="合格率" class-name="colorheader4">
+							<el-table-column label="合格率" 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.六车间_粗中细磨_合格率">{{ scope.row.data.六车间_粗中细磨_合格率 }}%</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不合格数" class-name="colorheader4">
+							<el-table-column label="不合格数" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_notok }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="短" class-name="colorheader4">
+							<el-table-column label="短" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_d }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="弯" class-name="colorheader4">
+							<el-table-column label="弯" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="有皮" class-name="colorheader4">
+							<el-table-column label="有皮" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_yp }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="断裂" class-name="colorheader4">
+							<el-table-column label="断裂" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="其他" class-name="colorheader4">
+							<el-table-column label="其他" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'粗中细磨') }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="加工日期" class-name="colorheader4" min-width="160">
+							<el-table-column label="加工日期" class-name="colorheader3" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_日期 }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="操作人" class-name="colorheader4">
+							<el-table-column label="操作人" class-name="colorheader3">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_操作人 }}</span>
 								</template>
@@ -327,7 +323,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" 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.六车间_抛光_合格率">{{ scope.row.data.六车间_抛光_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="划伤" class-name="colorheader4">
@@ -362,96 +358,101 @@
 							</el-table-column>
 						</el-table-column>
 						<!-- 开槽接收数 -->
-						<el-table-column label="开槽" class-name="colorheader4">
-							<el-table-column label="接收数" class-name="colorheader4">
+						<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.六车间_开槽_count_use }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不合格数" class-name="colorheader4">
+							<el-table-column label="不合格数" class-name="colorheader5">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_notok }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="合格率" class-name="colorheader4">
+							<el-table-column label="合格率" 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.六车间_开槽_合格率">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="加工日期" class-name="colorheader4" min-width="160">
+							<el-table-column label="加工日期" class-name="colorheader5" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_日期 }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="操作人" class-name="colorheader4">
+							<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>
 						<!-- 6车间自己的检验 -->
-						<el-table-column label="检测" class-name="colorheader4">
-							<el-table-column label="接收数" class-name="colorheader4">
+						<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.六车间中检_count }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="合格率" class-name="colorheader4">
+							<el-table-column label="合格率" 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.六车间中检_合格率">{{ scope.row.data.六车间中检_合格率 }}%</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不合格数" class-name="colorheader4">
+							<el-table-column label="不合格数" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_notok }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="划伤" class-name="colorheader4">
+							<el-table-column label="划伤" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hs }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="炸纹" class-name="colorheader4">
+							<el-table-column label="炸纹" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zw }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="锥度大" class-name="colorheader4">
+							<el-table-column label="锥度大" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="气泡" class-name="colorheader4">
+							<el-table-column label="气泡" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qp }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="不亮" class-name="colorheader4">
+							<el-table-column label="不亮" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="气线" class-name="colorheader4">
+							<el-table-column label="气线" class-name="colorheader6">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="其他" class-name="colorheader4">
+							<el-table-column label="其他" class-name="colorheader6">
 									<template #default="scope">
 										<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间中检') }}</span>
 									</template>
 							</el-table-column>
-							<el-table-column label="日期" class-name="colorheader4" min-width="160">
+							<el-table-column label="日期" class-name="colorheader6" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_日期 }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="操作人" class-name="colorheader4">
+							<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>
+						<el-table-column label="车间库存" class-name="colorheader7">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间库存_count }}</span>
+							</template>
+						</el-table-column>
 					</el-table-column>
 					<el-table-column label="技术质量" align="center" class-name="colorheader5">
 						<el-table-column label="终检" class-name="colorheader5">
@@ -461,7 +462,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" 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.六车间生产入库_合格率">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数" class-name="colorheader5">
@@ -505,29 +506,29 @@
 							</template>
 						</el-table-column>
 					</el-table-column>
-					<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.库存_count }}</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="发货数" class-name="colorheader6">
+					<el-table-column label="发货数" class-name="colorheader1">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span>
 						</template>
 					</el-table-column>
-					<!-- <el-table-column label="发货检验数" class-name="colorheader6">
+					<el-table-column label="6号领取加工-发货合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span>
-						</template>
-					</el-table-column> -->
-					<el-table-column label="6号领取加工-发货合格率" 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.六车间_批次发货合格率">{{ scope.row.data.六车间_批次发货合格率 }}%</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="7号生产-发货合格率" class-name="colorheader7">
+					<el-table-column label="7号生产-发货合格率" 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.七车间_批次发货合格率">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
 						</template>
 					</el-table-column>
 				</scTable>
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 4487772c..367b09d4 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -67,7 +67,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" 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.管料成型_合格率">{{ scope.row.data.管料成型_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader1">
@@ -134,7 +134,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" 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.十车间入库_合格率">{{ scope.row.data.十车间入库_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader2">
@@ -281,7 +281,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" 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.管料退火_合格率">{{ scope.row.data.管料退火_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader3">
@@ -375,85 +375,85 @@
 							</template>
 						</el-table-column>
 					</el-table-column>
-					<el-table-column label="开槽" align="center" class-name="colorheader4">
-						<el-table-column label="加工数" class-name="colorheader4">
+					<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.六车间_开槽_count_real }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="合格率" class-name="colorheader4">
+						<el-table-column label="合格率" 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.六车间_开槽_合格率">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="不合格数" class-name="colorheader4">
+						<el-table-column label="不合格数" class-name="colorheader1">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_notok }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="断裂" class-name="colorheader4">
+						<el-table-column label="断裂" class-name="colorheader1">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_dl }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="其他" class-name="colorheader4">
+						<el-table-column label="其他" class-name="colorheader1">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{getCountQt(scope.row.data,'开槽')}}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="加工日期"  min-width="160" class-name="colorheader4">
+						<el-table-column label="加工日期"  min-width="160" 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="colorheader4">
+						<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="备注" class-name="colorheader4">
+						<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>
-					<el-table-column label="倒角" align="center" class-name="colorheader4">
-						<el-table-column label="加工数" class-name="colorheader4">
+					<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.六车间_倒角_count_real }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="合格率" class-name="colorheader4">
+						<el-table-column label="合格率" 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.六车间_倒角_合格率">{{ scope.row.data.六车间_倒角_合格率 }}%</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="不合格数" class-name="colorheader4">
+						<el-table-column label="不合格数" class-name="colorheader2">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_notok }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="断裂" class-name="colorheader4">
+						<el-table-column label="断裂" class-name="colorheader2">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_dl }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="其他" class-name="colorheader4">
+						<el-table-column label="其他" class-name="colorheader2">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{getCountQt(scope.row.data,'倒角')}}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="加工日期"  min-width="160" class-name="colorheader4">
+						<el-table-column label="加工日期"  min-width="160" 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="colorheader4">
+						<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="备注" class-name="colorheader4">
+						<el-table-column label="备注" class-name="colorheader2">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_备注 }}</span>
 							</template>
@@ -469,7 +469,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" 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.六车间中检_合格率">{{ scope.row.data.六车间中检_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader5">
@@ -541,7 +541,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader6">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.六车间生产入库_检验日期!==''">{{ scope.row.data.六车间生产入库_合格率 }}</span>
+							<span v-if="scope.row.data&&scope.row.data.六车间生产入库_检验日期!==''&&scope.row.data.六车间生产入库_合格率">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader6">
@@ -577,7 +577,7 @@
 				</el-table-column>
 				<el-table-column label="领管-终检合格率">
 					<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.七车间_批次发货合格率 }}</span>
+							<span v-if="scope.row.data&&scope.row.data.七车间_批次发货合格率">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
 						</template>
 				</el-table-column>
 				<el-table-column label="组合件批次号" min-width="160">