fix: 检测统计表板段统计添加检测日期和时间查询

This commit is contained in:
shijing 2026-01-13 15:09:32 +08:00
parent fb31274bdb
commit f798a0fa02
13 changed files with 266 additions and 47 deletions

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品尺寸检测_日期 }}
</template>
</el-table-column>
<el-table-column label="倒角" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品尺寸检测_缺陷项_倒角==undefined?scope.row.data.成品尺寸检测_缺陷项_倒角:0 }}</span>
@ -116,11 +135,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品尺寸检测_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品尺寸检测_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品外观复检一_日期 }}
</template>
</el-table-column>
<el-table-column label="划伤" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品外观复检一_缺陷项_划伤? scope.row.data.成品外观复检一_缺陷项_划伤:0 }}</span>
@ -236,11 +255,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品外观复检一_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品外观复检一_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,7 +2,7 @@
<el-container>
<el-header>
<div class="right-panel">
<!-- <el-date-picker
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
@ -15,7 +15,7 @@
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/> -->
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -56,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品外观复检二_日期 }}
</template>
</el-table-column>
<el-table-column label="划伤" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品外观复检二_缺陷项_划伤? scope.row.data.成品外观复检二_缺陷项_划伤:0 }}</span>
@ -250,11 +255,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品外观复检二_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品外观复检二_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品内外初检_日期 }}
</template>
</el-table-column>
<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品内外初检_缺陷项_毛坯长点?scope.row.data.成品内外初检_缺陷项_毛坯长点:0 }}</span>
@ -241,11 +260,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品内外初检_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品内外初检_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品内质复检_日期 }}
</template>
</el-table-column>
<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品内质复检_缺陷项_毛坯长点?scope.row.data.成品内质复检_缺陷项_毛坯长点:0 }}</span>
@ -236,11 +255,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品内外初检_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品内外初检_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品性能检测_日期 }}
</template>
</el-table-column>
<el-table-column label="剪切" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品性能检测_缺陷项_剪切?scope.row.data.成品性能检测_缺陷项_剪切:0 }}</span>
@ -146,11 +165,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品性能检测_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品性能检测_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.成品自检_日期 }}
</template>
</el-table-column>
<el-table-column label="腐蚀" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.成品自检_缺陷项_腐蚀?scope.row.data.成品自检_缺陷项_腐蚀:0 }}</span>
@ -176,11 +195,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__成品自检_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__成品自检_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.分检_日期 }}
</template>
</el-table-column>
<el-table-column label="S畸变" align="center" class-name="colorheader1">
<el-table-column label="差值" class-name="colorheader1">
<template #default="scope">
@ -125,11 +144,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__分检_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__分检_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.光锥成品检测_日期 }}
</template>
</el-table-column>
<el-table-column label="放大率" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.光锥成品检测_缺陷项_放大率?scope.row.data.光锥成品检测_缺陷项_放大率:0 }}</span>
@ -121,11 +140,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__光锥成品检测_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__光锥成品检测_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -41,6 +55,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.毛坯检测_日期 }}
</template>
</el-table-column>
<el-table-column label="放大率¢2mm" align="center" class-name="colorheader1">
<el-table-column label="差值" class-name="colorheader1">
<template #default="scope">
@ -201,11 +220,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__毛坯检测_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__毛坯检测_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
@ -241,64 +260,64 @@ export default {
return;
}
let propert = '';
if(index == 5&&column.label=='合格数'){
if(index == 6&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_放大率¢2mm不合格';
}
if(index == 7&&column.label=='合格数'){
if(index == 8&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_放大率¢16mm不合格';
}
if(index == 10&&column.label=='合格数'){
if(index == 11&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_剪切¢18.3mm不合格';
}
if(index == 11&&column.label=='可加工'){
if(index == 12&&column.label=='可加工'){
propert= '毛坯检测_缺陷项_剪切¢18.3mm可加工';
}
if(index == 12&&column.label=='内标合格'){
if(index == 13&&column.label=='内标合格'){
propert= '毛坯检测_缺陷项_暗点合格';
}
if(index == 13&&column.label=='长点不合格'){
if(index == 14&&column.label=='长点不合格'){
propert= '毛坯检测_缺陷项_暗点不合格';
}
if(index == 14&&column.label=='可加工'){
if(index == 15&&column.label=='可加工'){
propert= '毛坯检测_缺陷项_暗点合格';
}
if(index == 15&&column.label=='暗点重'){
if(index == 16&&column.label=='暗点重'){
propert= '毛坯检测_缺陷项_暗点重';
}
if(index == 16&&column.label=='花丝'){
if(index == 17&&column.label=='花丝'){
propert= '毛坯检测_缺陷项_花丝';
}
if(index == 17&&column.label=='网格'){
if(index == 18&&column.label=='网格'){
propert= '毛坯检测_缺陷项_网格';
}
if(index == 18&&column.label=='轻'){
if(index == 19&&column.label=='轻'){
propert= '毛坯检测_缺陷项_花朵';
}
if(index == 19&&column.label=='重'){
if(index == 20&&column.label=='重'){
propert= '毛坯检测_缺陷项_花朵重';
}
if(index == 20&&column.label=='S畸变不合格'){
if(index == 21&&column.label=='S畸变不合格'){
propert= '毛坯检测_缺陷项_S畸变不合格';
}
if(index == 21&&column.label=='弓形畸变不合格'){
if(index == 22&&column.label=='弓形畸变不合格'){
propert= '毛坯检测_缺陷项_弓形畸变不合格';
}
if(index == 22&&column.label=='炸废'){
if(index == 23&&column.label=='炸废'){
propert= '毛坯检测_缺陷项_炸废';
}
if(index == 23&&column.label=='角偏'){
if(index == 24&&column.label=='角偏'){
propert= '毛坯检测_缺陷项_角偏';
}
if(index == 24&&column.label=='色差'){
if(index == 25&&column.label=='色差'){
propert= '毛坯检测_缺陷项_色差';
}
if (propert!=='') {
let values = [];
if(index==5||index==7){
if(index==6||index==8){
values = data.map((item) =>!item.data[propert]?1:0);
}else if(index==10){
}else if(index==11){
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切¢18.3mm可加工']?1:0);
}else if(index==14){
}else if(index==15){
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_暗点不合格']?1:0);
}else{
values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,7 +56,12 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="炉号" prop="number" fixed="left">
<el-table-column label="炉号" prop="" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.扭后检测_日期 }}
</template>
</el-table-column>
<el-table-column label="扭转角" align="center" class-name="colorheader1">
<el-table-column label="差值" class-name="colorheader1">
@ -225,11 +244,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__扭后检测_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__扭后检测_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -2,6 +2,20 @@
<el-container>
<el-header>
<div class="right-panel">
<el-date-picker
v-model="query.last_time__gte"
type="date"
value-format="YYYY-MM-DD"
placeholder="开始时间"
style="width: 150px"
/>
<el-date-picker
v-model="query.last_time__lte"
type="date"
value-format="YYYY-MM-DD"
placeholder="结束时间"
style="margin-left: 2px; width: 150px"
/>
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
@ -42,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.中检一_日期 }}
</template>
</el-table-column>
<el-table-column label="炸" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_炸?scope.row.data.中检一_缺陷项_炸:0 }}</span>
@ -171,11 +190,11 @@ export default {
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time';
obj1.field = 'data__中检一_日期';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time';
obj2.field = 'data__中检一_日期';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';

View File

@ -56,6 +56,11 @@
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left">
</el-table-column>
<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
<template #default="scope">
{{ scope.row.data.中检二_日期 }}
</template>
</el-table-column>
<el-table-column label="炸废" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检二_缺陷项_炸废?scope.row.data.中检二_缺陷项_炸废:0 }}</span>