From ae943f6b152b01e78a01fdb6587a05e187db111d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 10 Apr 2026 16:02:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=83=AD=E5=8E=8B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=88=E6=89=AD=E8=BD=AC=EF=BC=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursRY_NZ.vue | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/statistics/bxerp/workHoursRY_NZ.vue b/src/views/statistics/bxerp/workHoursRY_NZ.vue
index c0f9e75d..45343b3a 100644
--- a/src/views/statistics/bxerp/workHoursRY_NZ.vue
+++ b/src/views/statistics/bxerp/workHoursRY_NZ.vue
@@ -88,13 +88,13 @@
 								</el-table-column>
 								<el-table-column label="炸纹">
 									<template #default="scope">
-										<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
+										<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="炸废">
 									<template #default="scope">
-										<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
+										<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
@@ -161,13 +161,13 @@
 								</el-table-column>
 								<el-table-column label="炸纹">
 									<template #default="scope">
-										<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
+										<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="炸废">
 									<template #default="scope">
-										<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
+										<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
@@ -230,13 +230,13 @@
 								</el-table-column>
 								<el-table-column label="炸纹">
 									<template #default="scope">
-										<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
+										<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="炸废">
 									<template #default="scope">
-										<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
+										<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
@@ -299,13 +299,13 @@
 								</el-table-column>
 								<el-table-column label="炸纹">
 									<template #default="scope">
-										<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
+										<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="炸废">
 									<template #default="scope">
-										<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
+										<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
 										<span v-else>0</span>
 									</template>
 								</el-table-column>
@@ -346,11 +346,6 @@ export default {
 			showTable:false,
 			userName:'',
 			activeName: 'luhao',
-			query1:{
-				number_contains:'',
-				time_gte:'',
-				time_lte:'',
-			},
 			query2:{
 				process_name:'压板出炉',
 			},
@@ -377,7 +372,8 @@ export default {
 	methods: {
         getData(){
             let that = this;
-            let params = {},query ={testmgroup_name:'扭转'},biStr = '';
+            // let params = {},query ={testmgroup_name:'扭转'},biStr = '';
+            let params = {},query ={},biStr = '';
 			if(that.query.start_date==''||that.query.start_date==null){
 				that.query.start_date = query.start_date = that.start_date;
 			}else{
@@ -390,6 +386,8 @@ export default {
 			}
 			if(that.activeName=='luhao'){
 				query.select_cols = that.query.select_cols;
+				query.mgroup_name = '装炉压板出炉';
+				query.testmgroup_name = '扭后检测';
 				params.query = query;
 				biStr = 'product_defect_equip_mpjc';
 			}else if(that.activeName=='muju'){