fix:采购统计、销售统计（已完成）棒统计、管统计（待完善）

src/views/statistics/inm_statistics.vue

@@ -41,7 +41,21 @@
 						<el-header>
 							<div class="right-panel">
 								<h2>产品交付统计</h2>
-								<el-select
+								<xtSelect
+									:apiObj="apiObjMaterial"
+									:params = "paramsMaterial"
+									v-model="materialSale"
+									v-model:label="materialName"
+									v-model:obj="materialItem"
+									@change="materialSaleChange"
+								>
+									<el-table-column type="index" width="50" />
+									<el-table-column label="名称" prop="name"></el-table-column>
+									<el-table-column label="规格" prop="specification"></el-table-column>
+									<el-table-column label="型号" prop="model"></el-table-column>
+									<el-table-column label="库存" prop="count"></el-table-column>
+								</xtSelect>
+								<!-- <el-select
 									v-model="materialSale"
 									clearable
 									@change="materialSaleChange"
@@ -53,7 +67,7 @@
 										:value="item.id"
 									>
 									</el-option>
-								</el-select>
+								</el-select> -->
 							</div>
 						</el-header>
 						<el-row>
@@ -188,6 +202,7 @@ export default {
 			end_date: "",
 			currentYear: "",
 			currentMonth: "",
+			materialName: "",
 			xAxisOrigin: [],
 			xAxisData: [],
 			typeOptions: ["月", "年"],
@@ -227,20 +242,10 @@ export default {
 			tableData2: [],
 			firstWeekNum: 1,
 			endWeekNum: 4,
-			monthList: [
+			monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
-				"一月",
+			materialItem:{},
-				"二月",
+			paramsMaterial:{type__in : "10"},
-				"三月",
+			apiObjMaterial:this.$API.mtm.material.list,
-				"四月",
-				"五月",
-				"六月",
-				"七月",
-				"八月",
-				"九月",
-				"十月",
-				"十一月",
-				"十二月",
-			],
 		};
 	},
 	mounted() {
@@ -251,16 +256,12 @@ export default {
 		let days = new Date(year, month, 0).getDate();
 		that.currentYear = year;
 		that.currentMonth = month;
+		that.firstWeekNum = that.getWeekOfYear(year,month,1);
+		that.endWeekNum = that.getWeekOfYear(year,month,days);
+		month = month < 10 ? "0" + month : month;
 		that.start_date = year + "-" + month + "-01";
-		that.end_date =
+		that.end_date =year + "-" + month + "-" + days;
-			year + "-" + month + "-" + new Date(year, month, 0).getDate();
+		that.queryDate = year + "-" + month;
-		let month1 = month;
-		if (month1 < 10) {
-			month1 = "0" + month1;
-		}
-		that.queryDate = year + "-" + month1;
-		that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
-		that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
 		let duration = that.endWeekNum - that.firstWeekNum + 1;
 		for (let i = 1; i <= duration; i++) {
 			that.xAxisOrigin.push("第" + i + "周");
@@ -272,17 +273,16 @@ export default {
 		that.rightHeight = height - 115;
 		that.getTable();
 		that.setChart("bachart1", that.basicOption);
-		this.getSaleOption();
+		// this.getSaleOption();
 	},
 	methods: {
 		setChart(name, option = null) {
 			// 根据name 渲染数据, option需填写，否则option为模拟数据
-			var myChart = echarts.getInstanceByDom(
+			var myChart = echarts.getInstanceByDom(document.getElementById(name));
-				document.getElementById(name)
+			if (myChart != null) {
-			);
+				myChart.dispose(); // 销毁之前的实例
-			if (myChart == undefined) {
-				myChart = echarts.init(document.getElementById(name), "T");
 			}
+			myChart = echarts.init(document.getElementById(name), "T");
 			if (option == null) {
 				option = Object.assign({}, this.basicOption);
 			}
@@ -296,24 +296,13 @@ export default {
 			console.log(value);
 			this.queryDate = "";
 		},
-		getWeekOfYear(date) {
+		getWeekOfYear(a,b,c) {
-			var target = new Date(
+			var date1 = new Date(a, parseInt(b) - 1, c), //当前日期  
-				date.getFullYear(),
+            date2 = new Date(a, 0, 1), //当年第一天  
-				date.getMonth(),
+            // d是当前日期是今年第多少天  
-				date.getDate()
+            d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
-			); // 创建目标日期对象
+            // d + 当前年的第一天的周差距的和在除以7就是本年第几周  
-			var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
+            return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
-			if (target.getTime() == firstDayOfYear.getTime()) {
-				return 1;
-			} else {
-				return Math.ceil(
-					(target -
-						firstDayOfYear +
-						8 * (firstDayOfYear.getTimezoneOffset() / 480)) /
-						604800000
-				);
-			}
-			// 计算两者之间相隔的周数并返回结果
 		},
 		materialSaleChange() {
 			this.getSaleData();
@@ -331,8 +320,6 @@ export default {
 		//交付物料
 		getSaleData() {
 			let that = this;
-			let option = deepCopy(that.basicOption);
-			option.xAxis.data = that.xAxisData;
 			let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
 			let obj = {
 				query: {
@@ -343,27 +330,15 @@ export default {
 				},
 			};
 			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-				console.log("getSaleData", res);
+				if (res.data2.ds0&&res.data2.ds0.length>0) {
-				option.series.data = [];
+					that.tableData1 = res.data2.ds0;
-				if (res.data2.ds0) {
+					that.setChartData(res.data2.ds0);
-					let data = res.data2.ds0;
+				}else{
-					that.tableData1 = data;
+					let option = deepCopy(that.basicOption);
-					if (data.length > 0) {
+					option.xAxis.data = that.xAxisData;
-						let seriesData = [];
+					that.setChart("bachart1",option);
-						data.forEach((item) => {
-							if (that.queryType == "月") {
-								let index = item.周 - that.firstWeekNum;
-								seriesData[index] = item.数量;
-							} else {
-								let index = item.月 - 1;
-								seriesData[index] = item.数量;
 				}
 			});
-						option.series.data = seriesData;
-					}
-				}
-				that.setChart("bachart1", option);
-			});
 		},
 		getTable() {
 			let that = this;
@@ -379,7 +354,9 @@ export default {
 				that.tableData2 = [];
 				if (res.data2.ds0) {
 					let data = res.data2.ds0;
+					that.tableData1 = data;
 					that.tableData2 = data;
+					that.setChartData(data);
 				}
 			});
 		},
@@ -387,48 +364,33 @@ export default {
 			let that = this;
 			if (this.queryType == "月") {
 				if (this.queryDate !== "" && this.queryDate !== null) {
-					this.start_date = this.queryDate + "-01";
+					let arr = that.queryDate.split("-");
-					let arr = this.queryDate.split("-");
+                    let year = arr[0];
-					this.end_date =
+                    let month = arr[1];
-						this.queryDate +
+                    let days = new Date(year, month, 0).getDate();
-						"-" +
+					that.start_date = that.queryDate + "-01";
-						new Date(arr[0], arr[1], 0).getDate();
+					that.end_date =that.queryDate +"-" +days;
-					this.firstWeekNum = this.getWeekOfYear(
+					that.firstWeekNum = that.getWeekOfYear(year,month,1);
-						new Date(this.start_date)
+					that.endWeekNum = that.getWeekOfYear(year,month,days);
-					);
+					let duration = that.endWeekNum - that.firstWeekNum + 1;
-					this.endWeekNum = this.getWeekOfYear(
-						new Date(this.end_date)
-					);
-					let duration = this.endWeekNum - this.firstWeekNum + 1;
 					let xAxisData = [];
 					for (let i = 1; i <= duration; i++) {
 						xAxisData.push("第" + i + "周");
 					}
 					that.xAxisData = xAxisData;
 				} else {
-					this.start_date =
+					that.start_date =that.currentYear + "-" + that.currentMonth + "-01";
-						this.currentYear + "-" + this.currentMonth + "-01";
+					that.end_date =that.currentYear +"-" +that.currentMonth +"-" +new Date(that.currentYear,that.currentMonth,0).getDate();
-					this.end_date =
+					that.firstWeekNum = that.getWeekOfYear(that.currentYear,that.currentMonth,1);
-						this.currentYear +
+					that.xAxisData = that.xAxisOrigin;
-						"-" +
-						this.currentMonth +
-						"-" +
-						new Date(
-							this.currentYear,
-							this.currentMonth,
-							0
-						).getDate();
-					let date = new Date(this.start_date);
-					this.firstWeekNum = this.getWeekOfYear(date);
-					this.xAxisData = this.xAxisOrigin;
 				}
 			} else {
-				if (this.queryDate !== "" && this.queryDate !== null) {
+				if (that.queryDate !== "" && that.queryDate !== null) {
-					this.start_date = this.queryDate + "-01-01";
+					that.start_date = that.queryDate + "-01-01";
-					this.end_date = this.queryDate + "-12-31";
+					that.end_date = that.queryDate + "-12-31";
 				} else {
-					this.start_date = this.currentYear + "-01-01";
+					that.start_date = that.currentYear + "-01-01";
-					this.end_date = this.currentYear + "-12-31";
+					that.end_date = that.currentYear + "-12-31";
 				}
 				that.xAxisData = that.monthList;
 			}
@@ -437,6 +399,39 @@ export default {
 				that.getSaleData();
 			}
 		},
+		setChartData(data){
+			let that = this;
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			option.series=[];
+			let materials = [],seriesData = [];
+			data.forEach((item) => {
+				if(materials.indexOf(item.物料名) == -1){
+					materials.push(item.物料名);
+				}
+			})
+			materials.forEach((item) => {
+				let obj = {};
+				obj.name = item;
+				obj.type = "bar";
+				obj.stack = "Ad";
+				obj.barWidth = "15px";
+				obj.data = [0,0,0,0,0,0,0,0,0,0,0,0];
+				seriesData.push(obj);
+			})
+			data.forEach((item) => {
+				let index = 0;let indexY = 0;
+				if (that.queryType == "月") {
+					index = item.周 - that.firstWeekNum;
+				} else {
+					index = item.月 - 1;
+				}
+				indexY  = materials.indexOf(item.物料名);
+				seriesData[indexY].data[index] = item.数量;
+			});
+			option.series = seriesData;
+			that.setChart("bachart1", option);
+		},
 		handleExport(val) {
 			this.exportLoading = true;
 			let id = "#exportDiv" + val;

src/views/statistics/material_statistics.vue

@@ -43,6 +43,7 @@
 								<h2>采购统计</h2>
 								<xtSelect
 									:apiObj="apiObjMaterial"
+									:params = "paramsMaterial"
 									v-model="materialIn"
 									v-model:label="materialName"
 									v-model:obj="materialItem"
@@ -235,7 +236,7 @@ export default {
 			monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
 			materialItem:{},
 			apiObjMaterial:this.$API.mtm.material.list,
-			queryMaterial:{type__in : "30,40,50,60,70"}
+			paramsMaterial:{type__in : "30,40,50,60,70"}
 		};
 	},
 	mounted() {
@@ -262,7 +263,7 @@ export default {
 		that.rightHeight = height - 115;
 		that.tableHeight = height - 140 - chartheight;
 		that.setChart("bachart1", that.basicOption);
-		that.getInmOption();
+		// that.getInmOption();
 		that.getTable();
 	},
 	methods: {
@@ -332,10 +333,8 @@ export default {
 					that.tableData1 = res.data2.ds0;
 					that.setChartData(res.data2.ds0);
 				}else{
-					console.log('无数据')
 					let option = deepCopy(that.basicOption);
 					option.xAxis.data = that.xAxisData;
-					console.log(option);
 					that.setChart("bachart1",option);
 				}
 			});

src/views/statistics/statistics_bang.vue

@@ -94,6 +94,11 @@
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_qp }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_zz }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="扁">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_b }}</span>
@@ -204,122 +209,17 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_real }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="不合格数">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_notok }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="合格率">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<!-- 不合格原因及数量 -->
+						
-						<el-table-column label="划伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_hs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="短">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_d }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="炸纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="断裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_dl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_qp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="不亮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_hw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="有皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_yp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="爆皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="色差">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_sc }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zjd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气线">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_qx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="结石">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_js }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="椭圆度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_tydd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_w }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="加工日期">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_日期 }}</span>
@@ -341,114 +241,9 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="划伤">
+						<el-table-column label="不合格数">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_hs }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_notok }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="短">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_d }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="炸纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="断裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_dl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_qp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="不亮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_hw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="有皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_yp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="爆皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="色差">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_sc }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zjd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气线">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_qx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="结石">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_js }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="椭圆度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_tydd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -472,59 +267,14 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="划伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="短">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_d }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="炸纹">
+						<el-table-column label="弯">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zw }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="断裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="不亮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hw }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="有皮">
@@ -532,54 +282,19 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_yp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="爆皮">
+						<el-table-column label="断裂">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bp }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="色差">
+						<el-table-column label="其他">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sc }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qt }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="直径大">
+						<el-table-column label="不合格数">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjd }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_notok }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气线">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="结石">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_js }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="椭圆度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tydd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -608,36 +323,6 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hs }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="短">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_d }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="炸纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zw }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="断裂">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
@@ -648,76 +333,16 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="不亮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="有皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_yp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="爆皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="色差">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sc }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气线">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="结石">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_js }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="椭圆度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tydd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="其他">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qt }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="不合格数">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_notok }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="加工日期">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_日期 }}</span>
@@ -734,121 +359,16 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_use }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="不合格数">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_notok }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="合格率">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="划伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="短">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_d }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="炸纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="断裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_dl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="不亮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="有皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_yp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="爆皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="色差">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sc }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气线">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qx }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="结石">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_js }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="椭圆度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tydd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_w }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="加工日期">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_日期 }}</span>
@@ -875,39 +395,14 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hs }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="挫伤">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_cs }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="条纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="锥度大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="短">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_d }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="炸纹">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zw }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="断裂">
+						<el-table-column label="锥度大">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_dl }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="气泡">
@@ -920,64 +415,19 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="横纹">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="有皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_yp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="爆皮">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bp }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="色差">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sc }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="直径小">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjx }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="气线">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="结石">
+						<el-table-column label="其他">
 								<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_js }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qt }}</span>
 								</template>
 						</el-table-column>
-						<el-table-column label="椭圆度大">
+						<el-table-column label="不合格数">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tydd }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_notok }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="水雾">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sw }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="壁厚偏差大">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bhpcd }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="日期" prop="日期">
@@ -997,6 +447,31 @@
 								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_p }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="划伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="其他">
+								<template #default="scope">
+									<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
+								</template>
+						</el-table-column>
 						<el-table-column label="合格率">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>

src/views/statistics/statistics_guan.vue

@@ -343,114 +343,19 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_合格率 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="划伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="挫伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_cs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="杂质">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zz }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="条纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="锥度大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zdd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="短">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_d }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="炸纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zw }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="断裂">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_dl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="气泡">
+					<el-table-column label="其他">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qp }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qt }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="不亮">
+					<el-table-column label="不合格数">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bl }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_notok }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="横纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="有皮">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_yp }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="爆皮">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bp }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="色差">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sc }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径小">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结石">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="椭圆度大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tydd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="水雾">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="壁厚偏差大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bhpcd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_w }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="加工日期">
@@ -478,114 +383,15 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_合格率 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="划伤">
+				
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_hs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="挫伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_cs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="杂质">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zz }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="条纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_tw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="锥度大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zdd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="短">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_d }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="炸纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zw }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="断裂">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_dl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="气泡">
+					<el-table-column label="其他">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qp }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qt }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不亮">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bl }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="横纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_hw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="有皮">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_yp }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="爆皮">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bp }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="色差">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_sc }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zjd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径小">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zjx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结石">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="椭圆度大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_tydd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="水雾">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_sw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="壁厚偏差大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bhpcd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="弯">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_w }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="加工日期">
@@ -621,41 +427,21 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hs }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="挫伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_cs }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="杂质">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zz }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="条纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tw }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="锥度大">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="短">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_d }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="炸纹">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zw }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="断裂">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_dl }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="气泡">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qp }}</span>
@@ -676,54 +462,14 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_yp }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="爆皮">
+					<el-table-column label="其他">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bp }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qt }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="色差">
+					<el-table-column label="不合格数">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sc }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_notok }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="直径小">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结石">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="椭圆度大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tydd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="水雾">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="壁厚偏差大">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bhpcd }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_w }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="日期">
@@ -748,6 +494,21 @@
 							<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="划伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="炸纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_zw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="其他">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="日期">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>