zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:毛坯检测改动

This commit is contained in:
shijing 2025-10-29 16:27:34 +08:00
parent c4adfa8680
commit da13175ebb
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/views/statistics/bxerp/maopi.vue
View File

@ -63,7 +63,7 @@
</el-table-column> </el-table-column>
<el-table-column label="合格数" class-name="colorheader2"> <el-table-column label="合格数" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']?1-scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']:1 }}</span> <span>{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']?0:1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -92,20 +92,17 @@
<el-table-column label="暗点" align="center" class-name="colorheader4"> <el-table-column label="暗点" align="center" class-name="colorheader4">
<el-table-column label="内标合格" class-name="colorheader4"> <el-table-column label="内标合格" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data.毛坯检测_检测项_暗点=='合格'">1</span> <span>{{scope.row.data.毛坯检测_检测项_暗点合格?scope.row.data.毛坯检测_检测项_暗点合格:0 }}</span>
<span v-else>0</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长点不合格" class-name="colorheader4"> <el-table-column label="长点不合格" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data.毛坯检测_检测项_暗点=='不合格'">1</span> <span>{{scope.row.data.毛坯检测_检测项_暗点不合格?scope.row.data.毛坯检测_检测项_暗点不合格:0 }}</span>
<span v-else>0</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可加工" class-name="colorheader4"> <el-table-column label="可加工" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data.毛坯检测_检测项_暗点!=='合格'&&scope.row.data.毛坯检测_检测项_暗点!=='不合格'">1</span> <span>{{ !scope.row.data.毛坯检测_检测项_暗点合格&&!scope.row.data.毛坯检测_检测项_暗点不合格?1:0 }}</span>
<span v-else>0</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -125,11 +122,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="花朵" align="center" class-name="colorheader1"> <el-table-column label="花朵" align="center" class-name="colorheader1">
<el-table-column label="轻" align="center" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{scope.row.data.毛坯检测_缺陷项_花朵?scope.row.data.毛坯检测_缺陷项_花朵:0 }}</span> <span>{{scope.row.data.毛坯检测_缺陷项_花朵?scope.row.data.毛坯检测_缺陷项_花朵:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="S畸变" align="center" class-name="colorheader2"> <el-table-column label="重" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{scope.row.data.毛坯检测_缺陷项_花朵重?scope.row.data.毛坯检测_缺陷项_花朵重:0 }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="S畸变不合格" align="center" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{scope.row.data.毛坯检测_缺陷项_S畸变不合格?scope.row.data.毛坯检测_缺陷项_S畸变不合格:0 }}</span> <span>{{scope.row.data.毛坯检测_缺陷项_S畸变不合格?scope.row.data.毛坯检测_缺陷项_S畸变不合格:0 }}</span>
</template> </template>
@ -149,14 +153,11 @@
<span>{{ scope.row.data.毛坯检测_缺陷项_角偏?scope.row.data.毛坯检测_缺陷项_角偏:0 }}</span> <span>{{ scope.row.data.毛坯检测_缺陷项_角偏?scope.row.data.毛坯检测_缺陷项_角偏:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="出口" align="center" class-name="colorheader6"> <el-table-column label="色差" align="center" class-name="colorheader6">
<el-table-column label="国标" class-name="colorheader6"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷项_色差?scope.row.data.毛坯检测_缺陷项_色差:0 }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="内标" class-name="colorheader6">
</el-table-column>
<el-table-column label="内标放宽" class-name="colorheader6">
</el-table-column>
</el-table-column> -->
<el-table-column label="备注" align="center" class-name="colorheader7"> <el-table-column label="备注" align="center" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷项_备注 }}</span> <span>{{ scope.row.data.毛坯检测_缺陷项_备注 }}</span>
@ -249,8 +250,14 @@ export default {
if(index == 10&&column.label=='可加工'){ if(index == 10&&column.label=='可加工'){
propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工'; propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
} }
if(index == 11&&column.label=='内标合格'||index == 12&&column.label=='长点不合格'||index == 13&&column.label=='可加工'){ if(index == 11&&column.label=='内标合格'){
propert= '毛坯检测_检测项_暗点'; propert= '毛坯检测_检测项_暗点合格';
}
if(index == 12&&column.label=='长点不合格'){
propert= '毛坯检测_检测项_暗点不合格';
}
if(index == 13&&column.label=='可加工'){
propert= '毛坯检测_检测项_暗点合格';
} }
if(index == 14&&column.label=='暗点重'){ if(index == 14&&column.label=='暗点重'){
propert= '毛坯检测_缺陷项_暗点重'; propert= '毛坯检测_缺陷项_暗点重';
@ -261,35 +268,37 @@ export default {
if(index == 16&&column.label=='网格'){ if(index == 16&&column.label=='网格'){
propert= '毛坯检测_缺陷项_网格'; propert= '毛坯检测_缺陷项_网格';
} }
if(index == 17&&column.label=='花朵'){ if(index == 17&&column.label=='轻'){
propert= '毛坯检测_缺陷项_花朵'; propert= '毛坯检测_缺陷项_花朵';
} }
if(index == 18&&column.label=='S畸变'){ if(index == 18&&column.label=='重'){
propert= '毛坯检测_缺陷项_花朵重';
}
if(index == 19&&column.label=='S畸变不合格'){
propert= '毛坯检测_缺陷项_S畸变不合格'; propert= '毛坯检测_缺陷项_S畸变不合格';
} }
if(index == 19&&column.label=='弓形畸变不合格'){ if(index == 20&&column.label=='弓形畸变不合格'){
propert= '毛坯检测_缺陷项_弓形畸变不合格'; propert= '毛坯检测_缺陷项_弓形畸变不合格';
} }
if(index == 20&&column.label=='炸废'){ if(index == 21&&column.label=='炸废'){
propert= '毛坯检测_缺陷项_炸废'; propert= '毛坯检测_缺陷项_炸废';
} }
if(index == 21&&column.label=='角偏'){ if(index == 22&&column.label=='角偏'){
propert= '毛坯检测_缺陷项_角偏'; propert= '毛坯检测_缺陷项_角偏';
} }
if(index == 23&&column.label=='色差'){
propert= '毛坯检测_缺陷项_色差';
}
if (propert!=='') { if (propert!=='') {
let values = []; let values = [];
if(index==4||index==6){ if(index==4||index==6){
values = data.map((item) =>!item.data[propert]?1:0); values = data.map((item) =>!item.data[propert]?1:0);
}else if(index==9){ }else if(index==9){
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0); values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0);
}else if(index==11){
values = data.map((item) =>item.data[propert]=='合格'?1:0);
}else if(index==12){
values = data.map((item) =>item.data[propert]=='不合格'?1:0);
}else if(index==13){ }else if(index==13){
values = data.map((item) =>item.data[propert]!=='合格'&&item.data[propert]!=='不合格'?1:0); values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_检测项_暗点不合格']?1:0);
}else{ }else{
values = data.map((item) =>item.data[propert]!==undefined?Number(item.data[propert]):0); values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);
} }
console.log('values',values); console.log('values',values);
if (!values.every((value) => Number.isNaN(value))) { if (!values.every((value) => Number.isNaN(value))) {
@ -298,12 +307,8 @@ export default {
let sum = 0; let sum = 0;
sum = Number(Number(prev) + Number(curr)); sum = Number(Number(prev) + Number(curr));
if (!isNaN(value)) { if (!isNaN(value)) {
// let rate = Number(sum/total*100).toFixed(2);
// return <p class="count_row"><div ref="borrowAmount1">{sum}</div><br /><div ref="borrowAmount2">{rate}</div></p>
return sum; return sum;
} else { } else {
// let rate = Number(prev/total*100).toFixed(2);
// return <p class="count_row"><div ref="borrowAmount1">{prev}</div><br /><div ref="borrowAmount2">{rate}</div></p>
return prev; return prev;
} }
}, 0); }, 0);