From 9bc80fd0aab5bd3d58aad90038685195f4966dee Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 十二月 2023 13:10:58 +0800
Subject: [PATCH] 报警json文件存放在resources
---
CanadaMes-ui/src/lang/locales/en-US.json | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 1098904..3940824 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,4 +1,6 @@
{
+
+ "ip": "localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -109,6 +111,8 @@
"鏈夋晥": "Valid",
"鏃犳晥": "Invalid",
"璇疯緭鍏ュ悕绉�": "Please enter a name",
+ "璇疯緭鍏ヨ鑹�": "Please enter a role",
+ "璇疯緭鍏ユ潈闄愭弿杩�":"Please enter a permission description",
"闀垮害鍦� 2 鍒� 15 涓瓧绗�": "Length between 2 and 15 characters",
"璇疯緭鍏ョ姸鎬�": "Please enter the status",
"娣诲姞瑙掕壊": "Add Role",
@@ -299,7 +303,7 @@
"Confirm Modification":"Confirm modification",
"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",
- "Production queue":"Production queue",
+ "Outing Queue":"Outing 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",
@@ -312,6 +316,14 @@
"Suspend":"Suspend",
"Stop":"Stop",
"Start":"Start",
+ "Sequence":"Sequence",
+ "Position":"Position",
+ "Top":"Top",
+ "Up":"Up",
+ "Down":"Down",
+ "Unable to find the placement method of the aluminum frame":"Unable to find the placement method of the aluminum frame",
+ "Unable to find whether the aluminum frame is flipped or not":"Unable to find whether the aluminum frame is flipped or not",
+ "You do not have this permission":"You do not have this permission",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -335,12 +347,13 @@
"A02鍗婅嚜鍔ㄥ惎鍔�": "A02 Semi-Auto Start",
"B01 鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
"B02 鎵�鍦ㄦ牸瀛�": "B02 Current Grid"
+
},
"langParameter1": {
"A01~A02杈撻��": "A01~A02 Conveying",
"B01~B02杈撻��": "B01~B02 Conveying",
- "D01~D02杈撻��": "D01~D02 Conveying",
+ "D01~D06杈撻��": "D01~D06 Conveying",
"缈昏浆鐐瑰姩閫熷害": "Flip Jog Speed",
"灏忚溅鐐瑰姩閫熷害": "Cart Jog Speed",
"鏈�楂橀�熷害": "Max Speed",
@@ -371,7 +384,8 @@
"A01褰撳墠鏍煎瓙": "A01 Current Grid",
"A02鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
"B01鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
- "B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid"
+ "B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid",
+ "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks"
},
"langPositioning1": {
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -435,14 +449,14 @@
"B01鎵嬪姩鏍煎瓙": "B01 Target grid(Manual)",
"B01瀹氫綅閫熷害": "B01 TRAVEL POS Velocity manual",
"B01褰撳墠鏍煎瓙": "B01 Current Grid",
- "B01鍚姩": "Start",
+ "B01鍚姩": "B01 Start",
"澶嶄綅": "Reset",
"鍥為浂": "Zero",
"鏈洖闆�": "NotZero",
"B02鎵嬪姩鏍煎瓙": "B02 Target grid(Manual)",
"B02瀹氫綅閫熷害": "B02 TRAVEL POS Velocity manual",
"B02褰撳墠鏍煎瓙": "B02 Current Grid",
- "B02鍚姩": "Start",
+ "B02鍚姩": "B02 Start",
"澶嶄綅": "Reset",
"A01瀹炴椂浣嶇疆": "A01 tavel Actual Position",
"A02瀹炴椂浣嶇疆": "A02 tavel Actual Position",
@@ -461,7 +475,7 @@
"A02鎵嬪姩浣嶇疆": "A02 turn Target Angle(Manual)",
"A02瀹氫綅閫熷害": "A02 TURN POS Velocity manual",
"A02缈昏浆瀹炴椂浣嶇疆": "A02 turn Actual angle",
- "A02缈昏浆鍚姩": "SERVE TURN",
+ "A02缈昏浆鍚姩": "A02 SERVE TURN",
"A02澶嶄綅": "Reset",
"鏈洖闆�": "NotZero",
"鍥為浂": "Zero"
@@ -496,12 +510,12 @@
"A02琛岃蛋鐐瑰姩": "A02 SERVE TRAVEL",
"B01琛岃蛋鐐瑰姩": "B01 SERVE TRAVEL",
"B02琛岃蛋鐐瑰姩": "B02 SERVE TRAVEL",
- "B02缈昏浆姘旂几": "B02 YV TURN",
- "B02鍗囬檷姘旂几": "B02 YV UP DOWN",
- "B02鐢电闃�": "B02 YV Gassing",
- "B01缈昏浆姘旂几": "B01 YV TURN",
- "B01鍗囬檷姘旂几": "B01 YV UP DOWN",
- "B01鐢电闃�": "B01 YV Gassing",
+ "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",
--
Gitblit v1.8.0