From bbe45291ccc4a2839bc98c0499b8db257418e875 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 26 6月 2024 10:41:18 +0800
Subject: [PATCH] 2
---
iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue b/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
index 73bd743..fdf1bd0 100644
--- a/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
+++ b/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
@@ -83,6 +83,14 @@
dataIndex: 'qualityOP10To1'
}
],
+ EOP40: [
+ {
+ title: '杩炴潌鍘氬害',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP40To1'
+ }
+ ],
EOP20: [
{
title: '灏忓ご瀛旂洿寰�',
@@ -181,7 +189,7 @@
dataIndex: 'qualityOP60To1'
},
{
- title: '鏍￠獙鐮佺粨鏋�',
+ title: '灏忓ご瀛旂洿寰�',
align: 'center',
sorter: true,
dataIndex: 'qualityOP60To2'
@@ -208,6 +216,48 @@
}
],
EOP80: [
+ {
+ title: '鍘氬害',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_Houdu'
+ },
+ {
+ title: '涓績璺�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_ZXJ'
+ },
+ {
+ title: '澶уご瀛斿渾鏌卞害',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_DTKYZD'
+ },
+ {
+ title: '灏忓ご涓婇潰鍦嗗害',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_XTSMYD'
+ },
+ {
+ title: '灏忓ご涓嬮潰鍦嗗害',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_XTXMYD'
+ },
+ {
+ title: '澶уご瀛旂洿寰�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_D_TKZJ'
+ },
+ {
+ title: '灏忓ご瀛旂洿寰�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityOP80_X_TKZJ'
+ },
{
title: '澶уご閲嶉噺',
align: 'center',
@@ -1443,8 +1493,9 @@
} else {
this.getQualityInfoForID()
for (var key in this.qualityDataAll) {
- if (record.equipmentID == 'EOP40') {
- this.qualityDataCurrent = this.qualityDataAll.EOP10
+ if (record.equipmentID == 'EOP10' && record.workingProcedureCurrent=='OP40') {
+ debugger
+ this.qualityDataCurrent = this.qualityDataAll.EOP40
break
} else {
if (key == record.equipmentID) {
--
Gitblit v1.9.3