From c94ba268402dbea8817fe85e07971e078493fb62 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 16 May 2025 09:08:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=92=8C=E8=B4=A8=E6=A3=80=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_gx.vue       |  4 +-
 src/views/statistics/good_check_gx.vue | 97 +++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue
index 1a91e0f2..f91b42d1 100644
--- a/src/views/bigScreen/index_gx.vue
+++ b/src/views/bigScreen/index_gx.vue
@@ -1181,7 +1181,7 @@ export default {
 }
 
 .block1NumberWrap{
-	width:7.5vw;
+	width:11vw;
 	border: 1px solid rgba(54, 217, 187, 0.3);
 	padding: 3px;
 	text-align: center;
@@ -1202,7 +1202,7 @@ export default {
 	font-size: 0.8vh;
 }
 .block1Number{
-	font-size: 1.6vh;
+	font-size: 3vh;
 	vertical-align: bottom;
 	margin: 0 0.5em;
 	color: orange;
diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index 4450ca46..655290e5 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -47,165 +47,242 @@
 				id="exportDiv"
 				stripe
 				>
-					<el-table-column label="批次号" class-name="colorheader1" prop="batch">
+					<el-table-column label="批次号" class-name="colorheader1" prop="batch" min-width="150" fixed="left">
+						<template  #default="scope"><span>{{ scope.row.data.批次号 }}</span></template>
 					</el-table-column>
 					<el-table-column label="尺寸检验" align="center" class-name="colorheader1">
 						<el-table-column label="日期" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_日期 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验人" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_检验人 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验数" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_real }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈内径" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈内径 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈内径_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈外径" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈外径 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈外径_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="产品同心度" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品同心度 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品同心度_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="圆度" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度 }}</span></template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度_比例 }}</span></template>
 						</el-table-column>
 						<el-table-column label="产品外径小" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品外径小 }}</span></template>
 						</el-table-column>
 						<el-table-column label="产品外径大（返修）" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_产品外径大 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈缺口" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_黑圈缺口 }}</span></template>
 						</el-table-column>
 						<el-table-column label="外径发货片(B)" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_外径发货片 }}</span></template>
 						</el-table-column>
 						<el-table-column label="前道崩" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_前道崩 }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_ok_full }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_合格率 }}</span></template>
 						</el-table-column>
 						<el-table-column label="准合格" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_准合格 }}</span></template>
 						</el-table-column>
 						<el-table-column label="圆度准合格" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_圆度准合格 }}</span></template>
 						</el-table-column>
 						<el-table-column label="总合格数" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_ok }}</span></template>
 						</el-table-column>
 						<el-table-column label="总合格率" class-name="colorheader1">
+							<template  #default="scope"><span>{{ scope.row.data.尺寸检验_合格率 }}</span></template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="外观检验" align="center" class-name="colorheader2">
 						<el-table-column label="日期" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_日期 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验人" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_操作人 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验数" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_count_real }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_count_ok }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_合格率 }}</span></template>
 						</el-table-column>
 						<el-table-column label="划麻（返修）" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_划麻 }}</span></template>
 						</el-table-column>
 						<el-table-column label="脏（返修）" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_脏 }}</span></template>
 						</el-table-column>
 						<el-table-column label="气泡" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_气泡 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅气泡(B)" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅气泡 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈变形" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_黑圈变形 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈缺口" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_黑圈缺口 }}</span></template>
 						</el-table-column>
 						<el-table-column label="重水纹" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_重水纹 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅水纹(B)" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅水纹 }}</span></template>
 						</el-table-column>
 						<el-table-column label="大崩" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_大崩 }}</span></template>
 						</el-table-column>
 						<el-table-column label="小崩边(B)" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_小崩边 }}</span></template>
 						</el-table-column>
 						<el-table-column label="棕点" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_棕点 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅划麻(B)" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_浅划麻 }}</span></template>
 						</el-table-column>
 						<el-table-column label="双面划麻" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_双面划麻 }}</span></template>
 						</el-table-column>
 						<el-table-column label="倒角" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_倒角 }}</span></template>
 						</el-table-column>
 						<el-table-column label="棕圈" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_棕圈 }}</span></template>
 						</el-table-column>
 						<el-table-column label="蓝圈" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_蓝圈 }}</span></template>
 						</el-table-column>
 						<el-table-column label="尺寸小" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_尺寸小 }}</span></template>
 						</el-table-column>
 						<el-table-column label="破损" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_破损 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈有纹路" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_黑圈有纹路 }}</span></template>
 						</el-table-column>
 						<el-table-column label="发白" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_发白 }}</span></template>
 						</el-table-column>
 						<el-table-column label="漏光" class-name="colorheader2">
+							<template  #default="scope"><span>{{ scope.row.data.外观检验_漏光 }}</span></template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="返修" align="center" class-name="colorheader3">
 						<el-table-column label="日期" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_日期 }}</span></template>
 						</el-table-column>
 						<el-table-column label="检验人" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_操作人 }}</span></template>
 						</el-table-column>
 						<el-table-column label="返修数" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_count_real }}</span></template>
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_count_ok }}</span></template>
 						</el-table-column>
 						<el-table-column label="划麻（返修）" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_划麻}}</span></template>
 						</el-table-column>
 						<el-table-column label="脏（返修）" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_脏 }}</span></template>
 						</el-table-column>
 						<el-table-column label="气泡" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_气泡 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅气泡(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_气泡B }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈变形" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_黑圈变形 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈缺口" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_黑圈缺口 }}</span></template>
 						</el-table-column>
 						<el-table-column label="重水纹" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_重水纹 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅水纹(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_浅水纹 }}</span></template>
 						</el-table-column>
 						<el-table-column label="大崩" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_大崩 }}</span></template>
 						</el-table-column>
 						<el-table-column label="小崩边(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_小崩边 }}</span></template>
 						</el-table-column>
 						<el-table-column label="棕点" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_棕点 }}</span></template>
 						</el-table-column>
 						<el-table-column label="浅划麻(B)" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_浅划麻 }}</span></template>
 						</el-table-column>
 						<el-table-column label="双面划麻" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_双面划麻 }}</span></template>
 						</el-table-column>
 						<el-table-column label="倒角" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_倒角 }}</span></template>
 						</el-table-column>
 						<el-table-column label="棕圈" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_棕圈 }}</span></template>
 						</el-table-column>
 						<el-table-column label="蓝圈" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_蓝圈 }}</span></template>
 						</el-table-column>
 						<el-table-column label="尺寸小" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_尺寸小 }}</span></template>
 						</el-table-column>
 						<el-table-column label="破损" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_破损 }}</span></template>
 						</el-table-column>
 						<el-table-column label="黑圈有纹路" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_黑圈有纹路 }}</span></template>
 						</el-table-column>
 						<el-table-column label="发白" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_发白 }}</span></template>
 						</el-table-column>
 						<el-table-column label="漏光" class-name="colorheader3">
+							<template  #default="scope"><span>{{ scope.row.data.返修_漏光 }}</span></template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="外观总合格数" class-name="colorheader4">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_总合格数 }}</span></template>
 					</el-table-column>
 					<el-table-column label="外观总合格率" class-name="colorheader4">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_总合格率 }}</span></template>
 					</el-table-column>
 					<el-table-column label="直通良率" class-name="colorheader4">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_直通良率 }}</span></template>
 					</el-table-column>
 				</scTable>
 		</el-main>
@@ -222,7 +299,7 @@ export default {
 		return {
 			params: {
 				ordering:'-last_time',
-				batch__startswith__in:'ZJ2,G05',
+				data__has_key:"尺寸检验_日期",
 			},
 			query:{
 				batch__contains:'',
@@ -234,10 +311,26 @@ export default {
 			tableData:[],
 		};
 	},
+	mounted() {
+		let that = this;
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+		month = month < 10 ? "0" + month : month;
+		day = day < 10 ? "0" + day : day;
+		let queryDate = year + "-" + month + "-" + day;
+		that.query.start_date = that.query.end_date = that.currentDate = queryDate;
+	},
 	methods: {
 		handleQuery(){
 			this.$refs.table.queryData(this.query);
 		},
+		handleExport() {
+			this.exportLoading = true;
+			this.$XLSX("#exportDiv", "过程检验统计");
+			this.exportLoading = false;
+		},
 	},
 };
 </script>