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 @@
- {{scope.row.炸纹.含}}
+ {{scope.row.扭后炸纹.含}}
0
- {{scope.row.炸废.含}}
+ {{scope.row.扭后炸废.含}}
0
@@ -161,13 +161,13 @@
- {{scope.row.炸纹.含}}
+ {{scope.row.扭后炸纹.含}}
0
- {{scope.row.炸废.含}}
+ {{scope.row.扭后炸废.含}}
0
@@ -230,13 +230,13 @@
- {{scope.row.炸纹.含}}
+ {{scope.row.扭后炸纹.含}}
0
- {{scope.row.炸废.含}}
+ {{scope.row.扭后炸废.含}}
0
@@ -299,13 +299,13 @@
- {{scope.row.炸纹.含}}
+ {{scope.row.扭后炸纹.含}}
0
- {{scope.row.炸废.含}}
+ {{scope.row.扭后炸废.含}}
0
@@ -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'){