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.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs | 45 ++++--
iwara-scada-web/src/views/main/KnifeToolDataAction/modules/toolDetail.vue | 2
iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue | 347 +++++++++++++++++++++++++++++--------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 8
iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 1
5 files changed, 241 insertions(+), 162 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
index 4c93d23..c3b7044 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -235,10 +235,14 @@
public string QualityOP30To10 { get; set; }
public string QualityOP30To11 { get; set; }
-
+ /// <summary>
+ /// 鍘嬭鍔涚煩
+ /// </summary>
public string QualityOP35To1 { get; set; }
-
+ /// <summary>
+ /// Y杞翠綅绉�
+ /// </summary>
public string QualityOP35To2 { get; set; }
/// <summary>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
index 0f22807..00cc22e 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
@@ -936,6 +936,13 @@
public string SZB_OP50_M7_YSJ2 { get; set; }
public string SZB_OP50_M8_CZX1 { get; set; }
public string SZB_OP50_M9_CZX2 { get; set; }
+
+ //鏂板鍙傛暟
+ public string SZB_OP60_M1_CSD { get; set; }
+ public string SZB_OP60_M2_CKD { get; set; }
+ public string SZB_OP60_M3_CJL { get; set; }
+
+
public string SZB_OP60_M1_ZJB { get; set; }
public string SZB_OP60_M2_YDB { get; set; }
public string SZB_OP60_M3_PXD { get; set; }
@@ -969,6 +976,14 @@
public string M31_OP60_M13_TTA { get; set; }
public string M31_OP60_M14_BTA { get; set; }
public string M31_OP60_M14_SQE { get; set; }
+
+ public string M31_OP60_M15_SQE { get; set; }
+
+ public string M31_OP60_M16_SQE { get; set; }
+ public string M31_OP60_M17_SQE { get; set; }
+ public string M31_OP60_M18_SQE { get; set; }
+ public string M31_OP60_M19_SQE { get; set; }
+
public string SPC_OP20_M1_BXC { get; set; }
public string SPC_OP20_M5_BDS { get; set; }
public string SPC_OP20_M6_BDJ { get; set; }
@@ -1023,13 +1038,13 @@
public string RGT_OP20_M10_YLW { get; set; }
public string RGT_OP20_M11_ZWT { get; set; }
public string RGT_OP20_M12_YWT { get; set; }
- public string RGT_OP20_M13_LZS { get; set; }
- public string RGT_OP20_M14_LYS { get; set; }
- public string RGT_OP20_M15_LZD { get; set; }
- public string RGT_OP20_M16_LYD { get; set; }
- public string RGT_OP20_M17_LZS { get; set; }
- public string RGT_OP20_M18_LYS { get; set; }
- public string RGT_OP20_M19_DLK { get; set; }
+ public string RGT_OP20_M11_LZS { get; set; }
+ public string RGT_OP20_M12_LZS { get; set; }
+ public string RGT_OP20_M13_LZD { get; set; }
+ public string RGT_OP20_M14_LYD { get; set; }
+ public string RGT_OP20_M15_LZS { get; set; }
+ public string RGT_OP20_M16_LYS { get; set; }
+ public string RGT_OP20_M17_DLK { get; set; }
public string RGT_OP30_M1_YZJ { get; set; }
public string RGT_OP30_M2_ZLX { get; set; }
public string RGT_OP30_M3_YLX { get; set; }
@@ -1146,7 +1161,7 @@
//M31 OP60 M12 Distance 144.5000 -25.0000 25.0000 M31_OP60_M12_DSC
//M31 OP60 M13 Twist to A 0.0000 0.0000 200.0000 M31_OP60_M13_TTA
//M31 OP60 M14 Bend to A 0.0000 0.0000 75.0000 M31_OP60_M14_BTA
- //M31 OP60 M15 Squareness 0.0000 0.0000 40.0000 M31_OP60_M14_SQE
+ //M31 OP60 M15 Squareness 0.0000 0.0000 40.0000 M31_OP60_M15_SQE
//SPC OP20 M1 OP20鏍囪闈㈠皬澶村瓟绮楃硻搴z6-9 6.0000 0.0000 3.0000 SPC_OP20_M1_BXC
//SPC OP20 M5 OP20鏍囪闈㈠ぇ澶村瓟鍊掕娣卞害2.1卤0.15 2.1000 -0.1500 0.1500 SPC_OP20_M5_BDS
//SPC OP20 M6 OP20鏍囪闈㈠ぇ澶村瓟鍊掕瑙掑害45掳 45.0000 -5.0000 5.0000 SPC_OP20_M6_BDJ
@@ -1201,13 +1216,13 @@
//浜哄伐妫�娴嬪彴 OP20 M10 OP20鍙宠灪绾筂8X1-6H 1.0000 0.0000 1.0000 RGT_OP20_M10_YLW
//浜哄伐妫�娴嬪彴 OP20 M11 OP20铻虹汗宸﹀簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90) 鏈夎灪绾硅烦杩� 7.5500 -0.0400 0.0400 RGT_OP20_M11_ZWT
//浜哄伐妫�娴嬪彴 OP20 M12 OP20铻虹汗鍙冲簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90) 鏈夎灪绾硅烦杩� 7.5500 -0.0400 0.0400 RGT_OP20_M12_YWT
- //浜哄伐妫�娴嬪彴 OP20 M13 OP20铻烘爴瀛斿乏娣卞害26卤0.2锛堟墜鎸侀噺瑙凱91锛� 26.0000 -0.2000 0.2000 RGT_OP20_M13_LZS
- //浜哄伐妫�娴嬪彴 OP20 M14 OP20铻烘爴瀛斿彸娣卞害26卤0.2(鎵嬫寔閲忚P91) 26.0000 -0.2000 0.2000 RGT_OP20_M14_LYS
- //浜哄伐妫�娴嬪彴 OP20 M15 OP20铻虹汗宸﹀簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M15_LZD
- //浜哄伐妫�娴嬪彴 OP20 M16 OP20铻虹汗鍙冲簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M16_LYD
- //浜哄伐妫�娴嬪彴 OP20 M17 OP20铻虹汗宸︽繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M17_LZS
- //浜哄伐妫�娴嬪彴 OP20 M18 OP20铻虹汗鍙虫繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M18_LYS
- //浜哄伐妫�娴嬪彴 OP20 M19 OP20澶уご瀛旀瘺鍧鍦嗚疆寤撶浉瀵逛簬澶уご瀛斿悓杞村害蠁1 0.0000 0.0000 1.0000 RGT_OP20_M19_DLK
+ //浜哄伐妫�娴嬪彴 OP20 M13 OP20铻烘爴瀛斿乏娣卞害26卤0.2锛堟墜鎸侀噺瑙凱91锛� 26.0000 -0.2000 0.2000 RGT_OP20_M13_LZS 鏀逛负 RGT_OP20_M11_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M14 OP20铻烘爴瀛斿彸娣卞害26卤0.2(鎵嬫寔閲忚P91) 26.0000 -0.2000 0.2000 RGT_OP20_M14_LYS 鏀逛负 RGT_OP20_M12_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M15 OP20铻虹汗宸﹀簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M15_LZD 鏀逛负 RGT_OP20_M13_LZD
+ //浜哄伐妫�娴嬪彴 OP20 M16 OP20铻虹汗鍙冲簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M16_LYD 鏀逛负 RGT_OP20_M14_LYD
+ //浜哄伐妫�娴嬪彴 OP20 M17 OP20铻虹汗宸︽繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M17_LZS 鏀逛负 RGT_OP20_M15_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M18 OP20铻虹汗鍙虫繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M18_LYS 鏀逛负 RGT_OP20_M16_LYS
+ //浜哄伐妫�娴嬪彴 OP20 M19 OP20澶уご瀛旀瘺鍧鍦嗚疆寤撶浉瀵逛簬澶уご瀛斿悓杞村害蠁1 0.0000 0.0000 1.0000 RGT_OP20_M19_DLK 鏀逛负 RGT_OP20_M17_DLK
//浜哄伐妫�娴嬪彴 OP30 M1 OP30琛鍘嬭瑙掑害45掳 45.0000 -5.0000 5.0000 RGT_OP30_M1_YZJ
//浜哄伐妫�娴嬪彴 OP30 M2 OP30宸﹁灪鏍撶粓鍔涚煩绠＄悊鑼冨洿35-70N.m 35.0000 0.0000 35.0000 RGT_OP30_M2_ZLX
//浜哄伐妫�娴嬪彴 OP30 M3 OP30鍙宠灪鏍撶粓鍔涚煩绠＄悊鑼冨洿35-70N.m 35.0000 0.0000 35.0000 RGT_OP30_M3_YLX
diff --git a/iwara-scada-web/src/views/main/KnifeToolDataAction/modules/toolDetail.vue b/iwara-scada-web/src/views/main/KnifeToolDataAction/modules/toolDetail.vue
index bb75b00..537f85a 100644
--- a/iwara-scada-web/src/views/main/KnifeToolDataAction/modules/toolDetail.vue
+++ b/iwara-scada-web/src/views/main/KnifeToolDataAction/modules/toolDetail.vue
@@ -39,7 +39,7 @@
total: 0,
showTotal: (total, range) => `${range[0]}-${range[1]}鍏�${total}鏉,
showSizeChanger: true,
- pageSizeOptions: ['5', '10', '20', '30', '40'],
+ pageSizeOptions: ['5', '10', '20', '40', '50', '100', '200', '300'],
onChange: this.getData,
onShowSizeChange: this.showSizeChange
},
diff --git a/iwara-scada-web/src/views/main/WorkPieceProcess/index.vue b/iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
index 13700b4..d81cc4a 100644
--- a/iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
+++ b/iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
@@ -380,6 +380,7 @@
item.workingProcedureCurrent == 'OP80'
} else {
item.disabled = item.workingProcedureCurrent == 'OP05' || item.workingProcedureCurrent == 'OP50'
+ || item.workingProcedureCurrent == 'OP70'
}
})
},
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 fdf1bd0..f706b5b 100644
--- a/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
+++ b/iwara-scada-web/src/views/main/WorkPieceProcess/modules/qualityDetail.vue
@@ -559,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',
@@ -644,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'
}
]
},
@@ -745,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',
@@ -793,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'
+ // }
]
}
},
@@ -1142,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: {
@@ -1458,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'
+ },
]
}
}
--
Gitblit v1.9.3