fix:热压统计(扭转)调整
This commit is contained in:
parent
c6288d19aa
commit
ae943f6b15
|
|
@ -88,13 +88,13 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸纹">
|
<el-table-column label="炸纹">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
|
<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸废">
|
<el-table-column label="炸废">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
|
<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -161,13 +161,13 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸纹">
|
<el-table-column label="炸纹">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
|
<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸废">
|
<el-table-column label="炸废">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
|
<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -230,13 +230,13 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸纹">
|
<el-table-column label="炸纹">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
|
<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸废">
|
<el-table-column label="炸废">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
|
<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -299,13 +299,13 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸纹">
|
<el-table-column label="炸纹">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸纹">{{scope.row.炸纹.含}}</span>
|
<span v-if="scope.row.扭后炸纹">{{scope.row.扭后炸纹.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="炸废">
|
<el-table-column label="炸废">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.炸废">{{scope.row.炸废.含}}</span>
|
<span v-if="scope.row.扭后炸废">{{scope.row.扭后炸废.含}}</span>
|
||||||
<span v-else>0</span>
|
<span v-else>0</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -346,11 +346,6 @@ export default {
|
||||||
showTable:false,
|
showTable:false,
|
||||||
userName:'',
|
userName:'',
|
||||||
activeName: 'luhao',
|
activeName: 'luhao',
|
||||||
query1:{
|
|
||||||
number_contains:'',
|
|
||||||
time_gte:'',
|
|
||||||
time_lte:'',
|
|
||||||
},
|
|
||||||
query2:{
|
query2:{
|
||||||
process_name:'压板出炉',
|
process_name:'压板出炉',
|
||||||
},
|
},
|
||||||
|
|
@ -377,7 +372,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
getData(){
|
getData(){
|
||||||
let that = this;
|
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){
|
if(that.query.start_date==''||that.query.start_date==null){
|
||||||
that.query.start_date = query.start_date = that.start_date;
|
that.query.start_date = query.start_date = that.start_date;
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -390,6 +386,8 @@ export default {
|
||||||
}
|
}
|
||||||
if(that.activeName=='luhao'){
|
if(that.activeName=='luhao'){
|
||||||
query.select_cols = that.query.select_cols;
|
query.select_cols = that.query.select_cols;
|
||||||
|
query.mgroup_name = '装炉压板出炉';
|
||||||
|
query.testmgroup_name = '扭后检测';
|
||||||
params.query = query;
|
params.query = query;
|
||||||
biStr = 'product_defect_equip_mpjc';
|
biStr = 'product_defect_equip_mpjc';
|
||||||
}else if(that.activeName=='muju'){
|
}else if(that.activeName=='muju'){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue