diff --git a/src/api/qualityManagement/commonFQC.js b/src/api/qualityManagement/commonFQC.js
index 714dbd0..07d6fa2 100644
--- a/src/api/qualityManagement/commonFQC.js
+++ b/src/api/qualityManagement/commonFQC.js
@@ -49,10 +49,10 @@ export function GetWorkOrderFqcTableData(query) {
 }
 
 // 获取产线，抛光，一次合格品质量报表看板数据
-export function GetProductAndPolishAndOneTimeFqcBoardData(query) {
+export function GetProductAndPolishAndOneTimeFqcBoardData(data) {
 	return request({
 		url: '/mes/qc/FQC/common/getProductAndPolishAndOneTimeFqcBoardData',
 		method: 'post',
-		data: query,
+		data: data,
 	})
 }
\ No newline at end of file
diff --git a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
index 9da5405..05fdad4 100644
--- a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
+++ b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
@@ -1,51 +1,35 @@
 <template>
 	<div class="main-box">
 		<div class="box-left box-column">
-			<el-card class="card-type-2">
-				<div class="card-header">数据统计</div>
+			<el-card class="card-type-2" v-loading="loading">
+				<div class="card-header-box">数据统计</div>
 				<div class="box-column">
-					<span class="left-span-header">产线</span>
-					<div class="left-span">
-						<span class="span-text-1">产线上件总数</span>
-						<span class="span-num-1">{{ boardData.productRequireTotal }}</span>
-					</div>
 					<span class="left-span-header">抛光仓库</span>
 					<div class="left-span">
-						<span class="span-text-1">抛光仓库零件数</span>
+						<span class="span-text-1">现有零件数</span>
 						<span class="span-num-1">{{ boardData.polishWarehouseTotal }}</span>
 					</div>
-					<div class="left-span">
-						<span class="span-text-1">抛光投入总数</span>
-						<span class="span-num-1">{{ boardData.polishRequireTotal }}</span>
-					</div>
-					<div class="left-span">
-						<span class="span-text-1">后道检验投入总数</span>
-						<span class="span-num-1">{{ boardData.afterPolishRequireTotal }}</span>
-					</div>
 					<span class="left-span-header">一次合格品仓库</span>
 					<div class="left-span">
-						<span class="span-text-1">一次合格品仓库零件数</span>
+						<span class="span-text-1">现有零件数</span>
 						<span class="span-num-1">{{ boardData.oneTimeWarehouseTotal }}</span>
 					</div>
-					<div class="left-span">
-						<span class="span-text-1">GP12检测投入数</span>
-						<span class="span-num-1">{{ boardData.gP12RequireTotal }}</span>
-					</div>
+
 					<span class="left-span-header">成品仓库</span>
 					<div class="left-span">
-						<span class="span-text-1">成品仓库零件数</span>
+						<span class="span-text-1">现有零件数</span>
 						<span class="span-num-1">{{ boardData.finishProductPartTotal }}</span>
 					</div>
 					<div class="left-span">
-						<span class="span-text-1">成品仓库箱数</span>
+						<span class="span-text-1">现有箱数</span>
 						<span class="span-num-1">{{ boardData.finishProductPackageTotal }}</span>
 					</div>
 					<div class="left-span">
-						<span class="span-text-1">成品仓库出库零件数</span>
+						<span class="span-text-1">出库总零件数</span>
 						<span class="span-num-1">{{ boardData.finishProductPartOutTotal }}</span>
 					</div>
 					<div class="left-span">
-						<span class="span-text-1">成品仓库出库箱数</span>
+						<span class="span-text-1">出库总箱数</span>
 						<span class="span-num-1">{{ boardData.finishProductPackageOutTotal }}</span>
 					</div>
 				</div>
@@ -53,95 +37,148 @@
 		</div>
 		<div class="box-right box-column">
 			<div class="box-row">
-				<el-card class="card-type-1">
+				<el-card class="card-type-4">
+					<el-form :model="queryParams" size="small" label-position="right" inline ref="RecordQueryForm" @submit.native.prevent>
+						<el-form-item label="查询时间" prop="startTime">
+							<el-date-picker
+								v-model="queryParams.startTime"
+								type="datetime"
+								:clearable="true"
+								placeholder="开始时间"
+							></el-date-picker>
+						</el-form-item>
+						<el-form-item label="至" prop="endTime">
+							<el-date-picker
+								v-model="queryParams.endTime"
+								type="datetime"
+								:clearable="true"
+								placeholder="结束时间"
+								default-time="23:59:59"
+							></el-date-picker>
+						</el-form-item>
+						<el-form-item label="零件号" prop="partnumber">
+							<el-input v-model.trim="queryParams.partnumber" placeholder="请输入零件号" clearable />
+						</el-form-item>
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" size="mini" @click="getList()">搜索</el-button>
+						</el-form-item>
+					</el-form>
+				</el-card>
+			</div>
+			<div class="box-row">
+				<el-card class="card-type-1" v-loading="loading">
 					<div>
-						<span class="span-text-1">全部打磨总数</span>
+						<span class="span-text-1">打磨总数</span>
 						<span class="span-num-1">{{ boardData.sandingTotal }}</span>
 					</div>
 				</el-card>
-				<el-card class="card-type-1">
+				<el-card class="card-type-1" v-loading="loading">
 					<div>
-						<span class="span-text-1">全部报废总数</span>
+						<span class="span-text-1">报废总数</span>
 						<span class="span-num-1 color-red">{{ boardData.discardTotal }}</span>
 					</div>
 				</el-card>
 			</div>
-			<el-card class="card-type-3">
-				<div class="card-header">产线检验</div>
+			<el-card class="card-type-3" v-loading="loading">
+				<div class="card-header-box">
+					<span class="header-2">产线检验</span>
+					<div class="header-label-1">
+						<span class="span-text-1">上件数</span>
+						<span class="span-num-1">{{ boardData.productRequireTotal }}</span>
+					</div>
+				</div>
 				<div class="right-text-box">
 					<div>
-						<span class="span-text-1">合格总数</span>
+						<span class="span-text-1">合格数</span>
 						<span class="span-num-1">{{ boardData.productQualifiedTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">抛光总数</span>
+						<span class="span-text-1">抛光数</span>
 						<span class="span-num-1">{{ boardData.productPolishTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">打磨总数</span>
+						<span class="span-text-1">打磨数</span>
 						<span class="span-num-1">{{ boardData.productSandingTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">报废总数</span>
+						<span class="span-text-1">报废数</span>
 						<span class="span-num-1">{{ boardData.productDiscardTotal }}</span>
 					</div>
 				</div>
 			</el-card>
-			<el-card class="card-type-3">
-				<div class="card-header">抛光操作</div>
+			<el-card class="card-type-3" v-loading="loading">
+				<div class="card-header-box">
+					<span class="header-2">抛光操作</span>
+					<div class="header-label-1">
+						<span class="span-text-1">投入数</span>
+						<span class="span-num-1">{{ boardData.polishRequireTotal }}</span>
+					</div>
+				</div>
 				<div class="right-text-box">
 					<div>
-						<span class="span-text-1">合格总数</span>
+						<span class="span-text-1">合格数</span>
 						<span class="span-num-1">{{ boardData.polishQualifiedTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">打磨总数</span>
+						<span class="span-text-1">打磨数</span>
 						<span class="span-num-1">{{ boardData.polishSandingTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">报废总数</span>
+						<span class="span-text-1">报废数</span>
 						<span class="span-num-1">{{ boardData.polishDiscardTotal }}</span>
 					</div>
 				</div>
 			</el-card>
-			<el-card class="card-type-3">
-				<div class="card-header">后道检验</div>
+			<el-card class="card-type-3" v-loading="loading">
+				<div class="card-header-box">
+					<span class="header-2">后道检验</span>
+					<div class="header-label-1">
+						<span class="span-text-1">投入数</span>
+						<span class="span-num-1">{{ boardData.afterPolishRequireTotal }}</span>
+					</div>
+				</div>
 				<div class="right-text-box">
 					<div>
-						<span class="span-text-1">合格总数</span>
+						<span class="span-text-1">合格数</span>
 						<span class="span-num-1">{{ boardData.afterPolishQualifiedTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">抛光总数</span>
+						<span class="span-text-1">抛光数</span>
 						<span class="span-num-1">{{ boardData.afterPolishPolishTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">打磨总数</span>
+						<span class="span-text-1">打磨数</span>
 						<span class="span-num-1">{{ boardData.afterPolishSandingTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">报废总数</span>
+						<span class="span-text-1">报废数</span>
 						<span class="span-num-1">{{ boardData.afterPolishDiscardTotal }}</span>
 					</div>
 				</div>
 			</el-card>
-			<el-card class="card-type-3">
-				<div class="card-header">GP12检验</div>
+			<el-card class="card-type-3" v-loading="loading">
+				<div class="card-header-box">
+					<span class="header-2">GP12检验</span>
+					<div class="header-label-1">
+						<span class="span-text-1">投入数</span>
+						<span class="span-num-1">{{ boardData.gP12RequireTotal }}</span>
+					</div>
+				</div>
 				<div class="right-text-box">
 					<div>
-						<span class="span-text-1">合格总数</span>
+						<span class="span-text-1">合格数</span>
 						<span class="span-num-1">{{ boardData.gP12QualifiedTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">抛光总数</span>
+						<span class="span-text-1">抛光数</span>
 						<span class="span-num-1">{{ boardData.gP12PolishTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">打磨总数</span>
+						<span class="span-text-1">打磨数</span>
 						<span class="span-num-1">{{ boardData.gP12SandingTotal }}</span>
 					</div>
 					<div>
-						<span class="span-text-1">报废总数</span>
+						<span class="span-text-1">报废数</span>
 						<span class="span-num-1">{{ boardData.gP12DiscardTotal }}</span>
 					</div>
 				</div>
@@ -159,6 +196,11 @@ export default {
 		return {
 			loading: false,
 			timer1: null,
+			queryParams: {
+				partnumber: '',
+				startTime: this.$dayjs('2024-7-26').toDate(),
+				endTime: null,
+			},
 			boardData: {
 				sandingTotal: 0,
 				discardTotal: 0,
@@ -206,9 +248,10 @@ export default {
 		// 查询数据
 		getList() {
 			this.loading = true
-			GetProductAndPolishAndOneTimeFqcBoardData().then((res) => {
+			GetProductAndPolishAndOneTimeFqcBoardData(this.queryParams).then((res) => {
 				if (res.code == 200) {
 					this.boardData = res.data
+					this.loading = false
 				}
 			})
 		},
@@ -242,18 +285,20 @@ export default {
 	background-color: #e6e8eb;
 }
 .box-left {
-	width: 30%;
+	width: 25%;
 	height: 100vh - 60px;
 }
 .box-right {
-	width: 70%;
+	width: 75%;
 	height: 100%;
 }
-.card-header {
+.card-header-box {
 	width: 100%;
 	font-size: 20px;
 	font-weight: bold;
 	margin-bottom: 20px;
+	margin-right: 20px;
+	display: flex;
 }
 .box-row {
 	display: flex;
@@ -265,24 +310,30 @@ export default {
 }
 .card-type-1 {
 	width: 50%;
-	height: 80px;
-	margin: 10px;
+	height: 60px;
+	margin: 2px;
 	display: flex;
 	align-items: center;
 	justify-content: center;
 }
 .card-type-2 {
 	height: 100%;
-	margin: 10px;
+	margin: 2px;
 	display: flex;
 	flex-direction: column;
 }
 .card-type-3 {
 	height: 120px;
-	margin: 10px;
+	margin: 2px;
 	display: flex;
 	flex-direction: column;
 }
+.card-type-4 {
+	width: 100%;
+	margin: 2px;
+	/* height: 70px; */
+	display: flex;
+}
 .span-text-1 {
 	font-size: 16px;
 	color: #909399;
@@ -317,7 +368,17 @@ export default {
 	align-items: center;
 	justify-content: space-between;
 }
+.header-label-1 {
+	margin-left: 40px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+.header-2{
+	width: 100px;
+}
 .border {
 	border: 1px solid #000000;
 }
-</style>
\ No newline at end of file
+</style>