From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 160 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 103 insertions(+), 57 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 299086d..aa0348d 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,15 @@
{
-
- "ip": "localhost",
+ "Clear":"Clear",
+ "ip":"192.168.10.21",
+ "Abort":"Abort",
+ "Current scan":"Current scan",
+ "Interior Out Bypass: Right":"Interior Out Bypass: Right",
+ "Interior Out Bypass: Left":"Interior Out Bypass: Left",
+ "Remove Frame":"Remove Frame",
+ "Mes Connection failed":"Mes Connection failed",
+ "Plc1 Connection failed":"Plc1 Connection failed",
+ "Plc2 Connection failed":"Plc2 Connection failed",
+ "Remaining width:":"Remaining width:",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -39,6 +48,9 @@
"exit": "exit",
"changePassword": "changePassword",
"resetPassword": "resetPassword",
+ "Old password":"Old password",
+ "New password":"New password",
+ "Confirm password":"Confirm password",
"home": "Home",
"role": "role",
"langRoleManagement": "Role Management",
@@ -169,7 +181,8 @@
"B02 OUT pos error": "B02 OUT pos error"
},
"Electrical": "Electrical",
- "Parameter": "Parameter",
+ "Parameter": "Manual/Automatic",
+ "Manual/Automatic": "Manual/Automatic",
"Action": "Action",
"Sign": "Sign",
"State": "State",
@@ -243,7 +256,7 @@
"Length":"Length",
"Width":"Width",
"Operate":"Operate",
- "Terminate Task":"Terminate Task",
+ "Task Complete":"Task Complete",
"cancel":"cancel",
"confirm":"confirm",
"Number":"Number",
@@ -263,14 +276,14 @@
"List No":"List No",
"Box No":"Box No",
"Delete":"Delete",
- "Out":"Out",
+ "Outfeed":"Outfeed",
"Operation successful":"Operation successful",
"Operation canceled":"Operation canceled",
"There is no glass for this order":"There is no glass for this order",
"There are currently tasks":"There are currently tasks",
"There is no such glass":"There is no such glass",
- "There is no such slot":"There is no such slot",
+ "There is no such grid":"There is no such grid",
"No delete allowed":"No delete allowed",
"No out allowed":"No out allowed",
"Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
@@ -290,20 +303,22 @@
"Space (Pieces)":"Space (Pieces)",
"This glass is already in the cage":"This glass is already in the cage",
"Enter the Order No":"Enter the Order No",
- "OrderInfo":"OrderInfo",
+ "Order Info":"Order Info",
"Query":"Query",
"permission update":"permission update",
"query was successful":"query was successful",
"Scan Code Point":"Scan Code Point",
"Upper film position":"Upper film position",
"Glass Information":"Glass Information",
- "current Information":"current information",
- "Modify Information":"Modify information",
+ "D01 Current Information": "D01 Current Information",
+ "D02 Current Information": "D02 Current Information",
+ "D01 Modify Information": "D01 Modify Information",
+ "Scan Code Information":"Scan Code Information",
"Clear Current":"Clear Current",
- "Confirm Modification":"Confirm modification",
+ "Confirm":"Confirm",
"The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",
"This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",
- "Outing Queue":"Outing Queue",
+ "Outfeed Queue":"Outfeed Queue",
"Enter the Frame No":"Enter the Frame No",
"Frame No":"Frame No",
"Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
@@ -326,6 +341,7 @@
"You do not have this permission":"You do not have this permission",
"This glass is already in the Queue":"This glass is already in the Queue",
"Complete":"Complete",
+ "Allow":"Allow",
"Not Allow":"Not Allow",
"Completed":"Completed",
"Waiting":"Waiting",
@@ -335,6 +351,29 @@
"Approximately resettable time":"Approximately resettable time",
"EXTERIQR OUT AND BYPASS TO THE LEFT":"EXTERIQR OUT AND BYPASS TO THE LEFT",
"EXTERIQR OUT AND BYPASS TO THE RIGHT":"EXTERIQR OUT AND BYPASS TO THE RIGHT",
+ "Complete Task":"Complete Task",
+ "Outed":"Outed",
+ "Queue State":"Queue State",
+ "Sorting State":"Sorting State",
+ "Confirm State":"Confirm State",
+ "Next":"Next",
+ "Current Frame on Belt":"Current Frame on Belt",
+ "Outside":"Outside",
+ "Inside":"Inside",
+ "Cancel":"Cancel",
+ "Are you sure to clear this barcode ?":"Are you sure to clear this barcode ?",
+ "Terminate Feeding":"Terminate Feeding",
+ "Terminate Outing":"Terminate Outing",
+ "SoftEmergencyStop":"SoftEmergencyStop",
+ "Unable to clear glass ID in automatic mode":"Unable to clear glass ID in automatic mode",
+ "Are you sure you want an emergency stop ?":"Are you sure you want an emergency stop ?",
+ "Current State":"Current State",
+ "Automatic":"Automatic",
+ "Hand Movement":"Hand Movement",
+ "Please enter the correct glassID":"Please enter the correct glassID",
+ "Switch":"Switch",
+ "This frame has glass that is currently outing":"This frame has glass that is currently outing",
+ "The slot is disabled":"The slot is disabled",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -347,7 +386,7 @@
"A02缈昏浆瀹炴椂浣嶇疆": "A02FlipPosition",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Home",
"鐩爣鏍煎瓙": "Target Grid",
"A02 鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
@@ -369,9 +408,9 @@
"D01鎵嬪姩鐘舵��": "D01 Manual Status",
"娓呴櫎ID": "Clear ID",
"ID": "ID",
- "A02ID": "ID",
- "B01ID": "ID",
- "B02ID": "ID",
+ "A02ID": "A02ID",
+ "B01ID": "B01ID",
+ "B02ID": "B02ID",
"D02鎵嬪姩鐘舵��": "D02 Manual Status",
"D03鎵嬪姩鐘舵��": "D03 Manual Status",
"D04鎵嬪姩鐘舵��": "D04 Manual Status",
@@ -388,7 +427,12 @@
"A02鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
"B01鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
"B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid",
- "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks"
+ "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks",
+ "A01缁堟/缁х画": "A01Abort/ResumeTasks",
+ "A02缁堟/缁х画": "A02Abort/ResumeTasks",
+ "瀛樼墖绛夊緟寤舵椂": "Storage wait delay",
+ "杞�ュ仠": "emgHMI"
+
},
"langPositioning1": {
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -415,7 +459,7 @@
"缈昏浆瀹炴椂浣嶇疆": "FlipPosition",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Zero",
"鐩爣鏍煎瓙": "Target Grid",
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -434,7 +478,9 @@
"190#鏍煎湴鍧�": "grid address190#",
"鍑虹墖鏍间綅缃瀹�": "OutgoingGridPositionSetting",
"B01鏍间綅缃瀹�":"B01PositionSetting",
- "B02浣嶇疆璁惧畾":"B02PositionSetting"
+ "B02浣嶇疆璁惧畾":"B02PositionSetting",
+ "A01鍘熺偣璁板繂":"A01 Calibration Pos",
+ "A02鍘熺偣璁板繂":"A02 Calibration Pos"
},
"langPositioning2": {
@@ -456,30 +502,30 @@
"B01鍚姩": "B01 Start",
"澶嶄綅": "Reset",
"鍥為浂": "Home",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"B02鎵嬪姩鏍煎瓙": "B02 Target grid(Manual)",
"B02瀹氫綅閫熷害": "B02 TRAVEL POS Velocity manual",
"B02褰撳墠鏍煎瓙": "B02 Current Grid",
"B02鍚姩": "B02 Start",
"澶嶄綅": "Reset",
- "A01瀹炴椂浣嶇疆": "A01 tavel Actual Position",
- "A02瀹炴椂浣嶇疆": "A02 tavel Actual Position",
- "B01瀹炴椂浣嶇疆": "B02 tavel Actual Position",
- "B02瀹炴椂浣嶇疆": "B02 tavel Actual Position"
+ "A01瀹炴椂浣嶇疆": "A01 Actual Position",
+ "A02瀹炴椂浣嶇疆": "A02 Actual Position",
+ "B01瀹炴椂浣嶇疆": "B02 Actual Position",
+ "B02瀹炴椂浣嶇疆": "B02 Actual Position"
},
"Manualoneposition2lang": {
"A01鎵嬪姩浣嶇疆": "A01 turn Target Angle(Manual)",
"A01瀹氫綅閫熷害": "A01 TURN POS Velocity manual",
"A01缈昏浆瀹炴椂浣嶇疆": "A01 turn Actual angle",
- "A01缈昏浆鍚姩": "A01 SERVE TURN",
+ "A01缈昏浆鍚姩": "A01 Tilt",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Home",
"A02鎵嬪姩浣嶇疆": "A02 turn Target Angle(Manual)",
"A02瀹氫綅閫熷害": "A02 TURN POS Velocity manual",
"A02缈昏浆瀹炴椂浣嶇疆": "A02 turn Actual angle",
- "A02缈昏浆鍚姩": "A02 SERVE TURN",
+ "A02缈昏浆鍚姩": "A02 Tilt",
"A02澶嶄綅": "Reset"
@@ -507,37 +553,37 @@
"鎵嬪姩閫熷害": "Manual Speed"
},
"ManualJoglang": {
- "D01杈撻��": "D01 VFD conveyor",
- "D02杈撻��": "D02 VFD conveyor",
- "D03杈撻��": "D03 VFD conveyor",
- "D04杈撻��": "D04 VFD conveyor",
- "D05杈撻��": "D05 VFD conveyor",
- "D06杈撻��": "D06 VFD conveyor",
- "A01杈撻�佹鍚�": "A01 VFD conveyor",
- "A02杈撻�佹鍚�": "A02 VFD conveyor",
- "B01杈撻��": "B01 VFD conveyor",
- "B02杈撻��": "B02 VFD conveyor",
- "A01缈昏浆": "A01 SERVE TURN",
- "A02缈昏浆": "A02 SERVE TURN",
- "A01琛岃蛋鐐瑰姩": "A01 SERVE TRAVEL",
- "A02琛岃蛋鐐瑰姩": "A02 SERVE TRAVEL",
- "B01琛岃蛋鐐瑰姩": "B01 SERVE TRAVEL",
- "B02琛岃蛋鐐瑰姩": "B02 SERVE TRAVEL",
- "B02缈昏浆姘旂几": "B02 Solenoid TURN",
- "B02鍗囬檷姘旂几": "B02 Solenoid UP DOWN",
- "B02鍚规皵": "B02 Solenoid Gassing",
- "B01缈昏浆姘旂几": "B01 Solenoid TURN",
- "B01鍗囬檷姘旂几": "B01 Solenoid UP DOWN",
- "B01鍚规皵": "B01 Solenoid Gassing",
- "A01杈撻�佸弽鍚�": "A01 VFD conveyor reverse",
- "A02杈撻�佸弽鍚�": "A02 VFD conveyor reverse",
- "A01娉ㄧ數娉�": "A01 oil pump",
- "A02娉ㄧ數娉�": "A02 oil pump",
- "A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
- "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
- }
-
+ "D01杈撻��": "D01",
+ "D02杈撻��": "D02",
+ "D03杈撻��": "D03",
+ "D04杈撻��": "D04",
+ "D05杈撻��": "D05",
+ "D06杈撻��": "D06",
+ "A01杈撻�佹鍚�": "ConvCyor",
+ "A02杈撻�佹鍚�": "ConvCyor",
+ "B01杈撻��": "ConvCyor",
+ "B02杈撻��": "ConvCyor",
+ "A01缈昏浆": "Tilt",
+ "A02缈昏浆": "Tilt",
+ "A01琛岃蛋鐐瑰姩": "Drive",
+ "A02琛岃蛋鐐瑰姩": "Drive",
+ "B01琛岃蛋鐐瑰姩": "Drive",
+ "B02琛岃蛋鐐瑰姩": "Drive",
+ "B02缈昏浆姘旂几": "Tilt Cyl",
+ "B02鍗囬檷姘旂几": "V Cylinder",
+ "B02鍚规皵": "Air blow",
+ "B01缈昏浆姘旂几": "Tilt Cyl",
+ "B01鍗囬檷姘旂几": "V Cylinder",
+ "B01鍚规皵": "Air blow",
+ "A01杈撻�佸弽鍚�": "ConvCyor",
+ "A02杈撻�佸弽鍚�": "ConvCyor",
+ "A01娉ㄧ數娉�": "Oil Pump",
+ "A02娉ㄧ數娉�": "Oil Pump",
+ "A01鍘熺偣璁板繂":"A01 Calibration Pos",
+ "A02鍘熺偣璁板繂":"A02 Calibration Pos"
+ },
+
+ "Set":"Set"
-
}
\ No newline at end of file
--
Gitblit v1.8.0