fix:光芯统计小改动
This commit is contained in:
parent
8b345a1df6
commit
74a7078f69
|
|
@ -138,7 +138,7 @@
|
|||
</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div class="retangleWrap" style="padding-right: 0">
|
||||
<div class="retangleWrap" style="padding-left: 0">
|
||||
<div class="retangle bottomRetangle">
|
||||
<div class="warningHead">
|
||||
<div class="warningHeadText">预警提示</div>
|
||||
|
|
|
|||
|
|
@ -94,25 +94,25 @@
|
|||
<el-table-column label="黑圈内径" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈内径 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例" class-name="colorheader1">
|
||||
<el-table-column label="比例(%)" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈内径_比例 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="黑圈外径" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈外径 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例" class-name="colorheader1">
|
||||
<el-table-column label="比例(%)" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_黑圈外径_比例 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="产品同心度" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品同心度 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例" class-name="colorheader1">
|
||||
<el-table-column label="比例(%)" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_产品同心度_比例 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="圆度" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_圆度 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例" class-name="colorheader1">
|
||||
<el-table-column label="比例(%)" class-name="colorheader1">
|
||||
<template #default="scope"><span>{{ scope.row.data.尺寸检验_缺陷_圆度_比例 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="产品外径小" class-name="colorheader1">
|
||||
|
|
@ -168,12 +168,21 @@
|
|||
<el-table-column label="划麻(返修)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_划麻(返修)'] }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例(%)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_划麻(返修)_比例'] }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="脏(返修)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_脏(返修) ']}}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例(%)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_脏(返修)_比例'] }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="气泡" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_气泡 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例(%)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_气泡_比例 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="浅气泡(B)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_浅气泡(B)'] }}</span></template>
|
||||
</el-table-column>
|
||||
|
|
@ -195,6 +204,9 @@
|
|||
<el-table-column label="小崩边(B)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_小崩边(B)'] }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="比例(%)" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data['外观检验_缺陷_小崩边(B)_比例'] }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="棕点" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_棕点 }}</span></template>
|
||||
</el-table-column>
|
||||
|
|
@ -292,10 +304,19 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="外观总合格率(%)" class-name="colorheader4">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_完全总合格率 }}</span></template>
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.data.外观检验_完全总合格率">{{ scope.row.data.外观检验_完全总合格率 }}</span>
|
||||
<span v-else-if="scope.row.data.外观检验_完全合格率">{{ scope.row.data.外观检验_完全合格率 }}</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="直通良率" class-name="colorheader4">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_完全直通合格率 }}</span></template>
|
||||
<el-table-column label="直通良率(%)" class-name="colorheader4">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.data.外观检验_完全直通合格率">{{ scope.row.data.外观检验_完全直通合格率 }}</span>
|
||||
<span v-else-if="scope.row.data.尺寸检验_合格率">{{ scope.row.data.尺寸检验_合格率 }}</span>
|
||||
<span v-else-if="scope.row.data.外观检验_完全总合格率">{{ scope.row.data.外观检验_完全总合格率 }}</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-main>
|
||||
|
|
@ -333,7 +354,11 @@ export default {
|
|||
page:1,
|
||||
page_size:20,
|
||||
ordering:"-last_time",
|
||||
querys:[[{field:"data__has_key",compare:"",value:"尺寸检验_日期"}]],
|
||||
querys:[
|
||||
[{field:"data__has_key",compare:"",value:"尺寸检验_日期"}],
|
||||
[{field:"data__has_key",compare:"",value:"外观检验_日期"}],
|
||||
[{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}]
|
||||
],
|
||||
},
|
||||
apiObj: this.$API.wpm.batchst,
|
||||
dataTotal:0,
|
||||
|
|
|
|||
|
|
@ -2,16 +2,6 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<!-- <el-select v-model="query.mgroup_name"
|
||||
placeholder="请选择工段">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item"
|
||||
>
|
||||
</el-option>
|
||||
</el-select> -->
|
||||
<el-date-picker
|
||||
v-model="queryDate"
|
||||
type="date"
|
||||
|
|
@ -985,6 +975,186 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<!-- 16 -->
|
||||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="10">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart16"></div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="14">
|
||||
<el-card shadow="never" style="position: relative">
|
||||
<el-button
|
||||
@click="handleExport(16)"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-table
|
||||
:data="tableData16"
|
||||
id="exportDiv16"
|
||||
:height="300"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="设备名称" prop="设备名称" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
<el-table-column label="生产数" prop="生产数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="前道不良" prop="加工前不良">
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格数" align="center">
|
||||
<el-table-column label="线痕" prop="线痕"></el-table-column>
|
||||
<el-table-column label="破损" prop="破损"></el-table-column>
|
||||
<el-table-column label="麻点" prop="麻点"></el-table-column>
|
||||
<el-table-column label="气泡" prop="气泡"></el-table-column>
|
||||
<el-table-column label="水纹" prop="水纹"></el-table-column>
|
||||
<el-table-column label="崩边" prop="崩边"></el-table-column>
|
||||
<el-table-column label="划伤" prop="划伤"></el-table-column>
|
||||
<el-table-column label="其他" prop="其他"></el-table-column>
|
||||
<el-table-column label="合计" prop="不合格数"></el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
{{ (scope.row.合格率).toFixed(2) }}%
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<!-- 17 -->
|
||||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="10">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart17"></div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="14">
|
||||
<el-card shadow="never" style="position: relative">
|
||||
<el-button
|
||||
@click="handleExport(17)"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-table
|
||||
:data="tableData17"
|
||||
id="exportDiv17"
|
||||
:height="300"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="设备名称" prop="设备名称" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
<el-table-column label="生产数" prop="生产数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="前道不良" prop="加工前不良">
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格数" align="center">
|
||||
<el-table-column label="线痕" prop="线痕"></el-table-column>
|
||||
<el-table-column label="破损" prop="破损"></el-table-column>
|
||||
<el-table-column label="麻点" prop="麻点"></el-table-column>
|
||||
<el-table-column label="气泡" prop="气泡"></el-table-column>
|
||||
<el-table-column label="水纹" prop="水纹"></el-table-column>
|
||||
<el-table-column label="崩边" prop="崩边"></el-table-column>
|
||||
<el-table-column label="划伤" prop="划伤"></el-table-column>
|
||||
<el-table-column label="其他" prop="其他"></el-table-column>
|
||||
<el-table-column label="合计" prop="不合格数"></el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
{{ (scope.row.合格率).toFixed(2) }}%
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<!-- 18 -->
|
||||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="10">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart18"></div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="14">
|
||||
<el-card shadow="never" style="position: relative">
|
||||
<el-button
|
||||
@click="handleExport(18)"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-table
|
||||
:data="tableData18"
|
||||
id="exportDiv18"
|
||||
:height="300"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="设备名称" prop="设备名称" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="日期">
|
||||
<template #default="scope">
|
||||
{{ scope.row.日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
<el-table-column label="生产数" prop="生产数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="前道不良" prop="加工前不良">
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格数" align="center">
|
||||
<el-table-column label="线痕" prop="线痕"></el-table-column>
|
||||
<el-table-column label="破损" prop="破损"></el-table-column>
|
||||
<el-table-column label="麻点" prop="麻点"></el-table-column>
|
||||
<el-table-column label="气泡" prop="气泡"></el-table-column>
|
||||
<el-table-column label="水纹" prop="水纹"></el-table-column>
|
||||
<el-table-column label="崩边" prop="崩边"></el-table-column>
|
||||
<el-table-column label="划伤" prop="划伤"></el-table-column>
|
||||
<el-table-column label="其他" prop="其他"></el-table-column>
|
||||
<el-table-column label="合计" prop="不合格数"></el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
{{ (scope.row.合格率).toFixed(2) }}%
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -1053,14 +1223,14 @@ export default {
|
|||
tableData13: [],
|
||||
tableData14: [],
|
||||
tableData15: [],
|
||||
tableData16: [],
|
||||
tableData17: [],
|
||||
tableData18: [],
|
||||
options:[],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
let nowDate = new Date();
|
||||
that.getMgroup();
|
||||
// that.getWeekDate(nowDate);
|
||||
this.getMgroup();
|
||||
},
|
||||
methods: {
|
||||
getWeekDate(dates){
|
||||
|
|
@ -1112,8 +1282,9 @@ export default {
|
|||
that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
|
||||
let arr = [];
|
||||
res.forEach(item=>{
|
||||
if(that.mgroupList.indexOf(item.name)>-1){
|
||||
arr.push(item.name)
|
||||
let indexes = that.mgroupList.indexOf(item.name);
|
||||
if(indexes>-1){
|
||||
arr[indexes] = item.name;
|
||||
}
|
||||
})
|
||||
that.query.mgroup_name = arr[0];
|
||||
|
|
@ -1167,6 +1338,14 @@ export default {
|
|||
let chartId = 'bachart'+mgroup_index;
|
||||
that.setChart(chartId, option);
|
||||
} else {
|
||||
let obj = {
|
||||
name:'',
|
||||
data: [],
|
||||
stack: "Ad",
|
||||
type: "bar",
|
||||
barWidth: "15px",
|
||||
};
|
||||
option.series.push(obj)
|
||||
let chartId = 'bachart'+mgroup_index;
|
||||
that.setChart(chartId, option);
|
||||
}
|
||||
|
|
@ -1190,7 +1369,8 @@ export default {
|
|||
#bachart1,#bachart2,#bachart3,#bachart4,
|
||||
#bachart5,#bachart6,#bachart7,#bachart8,
|
||||
#bachart9,#bachart10,#bachart11,#bachart12,
|
||||
#bachart13,#bachart14,#bachart15,#bachart0{
|
||||
#bachart13,#bachart14,#bachart15,#bachart16,
|
||||
#bachart17,#bachart18,#bachart0{
|
||||
width: 100%;
|
||||
height: 300px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue