From 0bbeeaf8cc151c2b31ca81c3989a6c6b1c6e4163 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 8月 2024 08:10:02 +0800
Subject: [PATCH] 修复 测量岛部分 数据要变更名称
---
iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue | 362 ++++++++++++++++++++++++++++++---------------------
1 files changed, 215 insertions(+), 147 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 d2df25c..f706b5b 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'
@@ -551,7 +559,7 @@
title: '20鍚岃酱搴0.15_2.Z',
align: 'center',
sorter: true,
- dataIndex: 'szB_OP20_m31_TZD'
+ dataIndex: 'szB_OP20_M31_TZD'
},
{
title: 'X-鍊糭35',
@@ -636,59 +644,72 @@
sorter: true,
dataIndex: 'rgT_OP20_M10_YLW'
},
- {
- title: 'OP20铻虹汗宸﹀簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90)鏈夎灪绾硅烦杩�',
- align: 'center',
- sorter: true,
- dataIndex: 'rgT_OP20_M11_ZWT'
- },
- {
- title: 'OP20铻虹汗鍙冲簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90)鏈夎灪绾硅烦杩�',
- align: 'center',
- sorter: true,
- dataIndex: 'rgT_OP20_M12_YWT'
- },
+ //鏆傛椂搴熷純鍙傛暟 [Editby shaocx,2024-08-11]
+ // {
+ // title: 'OP20铻虹汗宸﹀簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90)鏈夎灪绾硅烦杩�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'rgT_OP20_M11_ZWT'
+ // },
+ // {
+ // title: 'OP20铻虹汗鍙冲簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90)鏈夎灪绾硅烦杩�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'rgT_OP20_M12_YWT'
+ // },
{
title: 'OP20铻烘爴瀛斿乏娣卞害26卤0.2锛堟墜鎸侀噺瑙凱91锛�',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M13_LZS'
+ //dataIndex: 'rgT_OP20_M13_LZS'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M11_LZS'
},
{
title: 'OP20铻烘爴瀛斿彸娣卞害26卤0.2(鎵嬫寔閲忚P91)',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M14_LYS'
+ //dataIndex: 'rgT_OP20_M14_LYS'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M12_LZS'
},
{
title: 'OP20铻虹汗宸﹀簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92)',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M15_LZD'
+ dataIndex: 'rgT_OP20_M13_LZD'
},
{
title: 'OP20铻虹汗鍙冲簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92)',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M16_LYD'
+ //dataIndex: 'rgT_OP20_M16_LYD'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M14_LYD'
},
{
title: 'OP20铻虹汗宸︽繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M17_LZS'
+ //dataIndex: 'rgT_OP20_M17_LZS'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M15_LZS'
},
{
title: 'OP20铻虹汗鍙虫繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M18_LYS'
+ //dataIndex: 'rgT_OP20_M18_LYS'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M16_LYS'
},
{
title: 'OP20澶уご瀛旀瘺鍧鍦嗚疆寤撶浉瀵逛簬澶уご瀛斿悓杞村害蠁1',
align: 'center',
sorter: true,
- dataIndex: 'rgT_OP20_M19_DLK'
+ //dataIndex: 'rgT_OP20_M19_DLK'
+ //鍙樻洿 銆怑ditby shaocx,2024-08-09銆�
+ dataIndex: 'rgT_OP20_M17_DLK'
}
]
},
@@ -737,18 +758,19 @@
sorter: true,
dataIndex: 'spC_OP20_M10_BYJ'
},
- {
- title: 'OP20鏍囪闈㈠乏铻烘爴瀛斿乏鍊掕娣卞害0.6锛�+0.4/0锛�',
- align: 'center',
- sorter: true,
- dataIndex: 'spC_OP20_M11_BZS'
- },
- {
- title: 'OP20鏍囪闈㈠乏铻烘爴瀛斿乏鍊掕瑙掑害30掳',
- align: 'center',
- sorter: true,
- dataIndex: 'spC_OP20_M12_BZJ'
- },
+ //鏆傛椂搴熷純鍙傛暟 [Editby shaocx,2024-08-11]
+ // {
+ // title: 'OP20鏍囪闈㈠乏铻烘爴瀛斿乏鍊掕娣卞害0.6锛�+0.4/0锛�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'spC_OP20_M11_BZS'
+ // },
+ // {
+ // title: 'OP20鏍囪闈㈠乏铻烘爴瀛斿乏鍊掕瑙掑害30掳',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'spC_OP20_M12_BZJ'
+ // },
{
title: 'OP20闈炴爣璁伴潰澶уご瀛斿�掕娣卞害2.1卤0.15',
align: 'center',
@@ -785,18 +807,19 @@
sorter: true,
dataIndex: 'spC_OP20_M18_FZJ'
},
- {
- title: 'OP20闈炴爣璁伴潰鍙宠灪鏍撳瓟宸﹀�掕娣卞害0.6锛�+0.4/0锛�',
- align: 'center',
- sorter: true,
- dataIndex: 'spC_OP20_M19_FYS'
- },
- {
- title: 'OP20闈炴爣璁伴潰鍙宠灪鏍撳瓟宸﹀�掕瑙掑害30掳',
- align: 'center',
- sorter: true,
- dataIndex: 'spC_OP20_M20_FYJ'
- }
+ //鏆傛椂搴熷純鍙傛暟 [Editby shaocx,2024-08-11]
+ // {
+ // title: 'OP20闈炴爣璁伴潰鍙宠灪鏍撳瓟宸﹀�掕娣卞害0.6锛�+0.4/0锛�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'spC_OP20_M19_FYS'
+ // },
+ // {
+ // title: 'OP20闈炴爣璁伴潰鍙宠灪鏍撳瓟宸﹀�掕瑙掑害30掳',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'spC_OP20_M20_FYJ'
+ // }
]
}
},
@@ -1134,114 +1157,134 @@
SZB: {
name: '涓夊潗鏍�',
data: [
- {
- title: '鐩村緞_22_鍦咮',
+ //鏂板鍙傛暟 [Editby shaocx,2024-08-11]
+ {
+ title: '閿Ы娣卞害锛�1.5 +0.5/0锛�',
align: 'center',
sorter: true,
- dataIndex: 'szB_OP60_M1_ZJB'
+ dataIndex: 'szB_OP60_M1_CSD'
},
{
- title: '鍦嗗害_0.003_B',
+ title: '閿Ы瀹藉害_3.2_Z锛�+0.1/0锛�',
align: 'center',
sorter: true,
- dataIndex: 'szB_OP60_M2_YDB'
+ dataIndex: 'szB_OP60_M2_CKD'
},
{
- title: '骞宠搴0.2_A',
+ title: '璺濈鈥斺��2.3卤0.1',
align: 'center',
sorter: true,
- dataIndex: 'szB_OP60_M3_PXD'
+ dataIndex: 'szB_OP60_M3_CJL'
},
- {
- title: '骞宠搴0.2_A.Y',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M4_PXD'
- },
- {
- title: '骞宠搴0.075_A',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M5_PXD'
- },
- {
- title: '骞宠搴0.075_A.X',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M6_PXD'
- },
- {
- title: '鐩村緞_53_鍦咥',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M7_ZJA'
- },
- {
- title: '鍦嗘煴搴0.005',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M8_YZD'
- },
- {
- title: 'X_144.5_鍦咮',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M9_144X'
- },
- {
- title: '缁撴灉鍏冪礌1',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M10_YS1'
- },
- {
- title: '璺濈_3.2_Z',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M11_JLZ'
- },
- {
- title: '鍨傜嚎闀垮害_2.3',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M12_CXC'
- },
- {
- title: '鍨傜洿搴0.04_A-C',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M13_CZD'
- },
- {
- title: '鍨傜洿搴0.04_A-C.X',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M14_CZD'
- },
- {
- title: '鍨傜洿搴0.04_A-C.Y',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M15_CZD'
- },
- {
- title: '鍨傜洿搴0.04_B-C',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M16_CZD'
- },
- {
- title: '鍨傜洿搴0.04_B-C.X',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M17_CZD'
- },
- {
- title: '鍨傜洿搴0.04_B-C.Y',
- align: 'center',
- sorter: true,
- dataIndex: 'szB_OP60_M18_CZD'
- }
+ //鏆傛椂搴熷純鍙傛暟 [Editby shaocx,2024-08-11]
+ // {
+ // title: '鐩村緞_22_鍦咮',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M1_ZJB'
+ // },
+ // {
+ // title: '鍦嗗害_0.003_B',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M2_YDB'
+ // },
+ // {
+ // title: '骞宠搴0.2_A',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M3_PXD'
+ // },
+ // {
+ // title: '骞宠搴0.2_A.Y',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M4_PXD'
+ // },
+ // {
+ // title: '骞宠搴0.075_A',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M5_PXD'
+ // },
+ // {
+ // title: '骞宠搴0.075_A.X',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M6_PXD'
+ // },
+ // {
+ // title: '鐩村緞_53_鍦咥',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M7_ZJA'
+ // },
+ // {
+ // title: '鍦嗘煴搴0.005',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M8_YZD'
+ // },
+ // {
+ // title: 'X_144.5_鍦咮',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M9_144X'
+ // },
+ // {
+ // title: '缁撴灉鍏冪礌1',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M10_YS1'
+ // },
+ // {
+ // title: '璺濈_3.2_Z',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M11_JLZ'
+ // },
+ // {
+ // title: '鍨傜嚎闀垮害_2.3',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M12_CXC'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_A-C',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M13_CZD'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_A-C.X',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M14_CZD'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_A-C.Y',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M15_CZD'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_B-C',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M16_CZD'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_B-C.X',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M17_CZD'
+ // },
+ // {
+ // title: '鍨傜洿搴0.04_B-C.Y',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'szB_OP60_M18_CZD'
+ // }
]
},
RGT: {
@@ -1450,11 +1493,35 @@
dataIndex: 'm31_OP60_M14_BTA'
},
{
- title: 'Squareness',
+ title: 'Big_End_C_Squareness',
align: 'center',
sorter: true,
- dataIndex: 'm31_OP60_M14_SQE'
- }
+ dataIndex: 'm31_OP60_M15_SQE'
+ },
+ {
+ title: 'Sma_eND_c_Squareness',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'm31_OP60_M16_SQE'
+ },
+ {
+ title: '澶у瓟鍨傜洿搴鍚�0.04',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'm31_OP60_M17_SQE'
+ },
+ {
+ title: '澶у瓟鍨傜洿搴鍚�0.04',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'm31_OP60_M18_SQE'
+ },
+ {
+ title: '鍘氬害21.825卤0.025',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'm31_OP60_M19_SQE'
+ },
]
}
}
@@ -1485,8 +1552,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