From 3ab0fb6281f55924d49d7e28bd6655d59b2a346d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 10 五月 2024 09:37:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 150 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 125 insertions(+), 25 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index e49479d..197fd40 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,5 +1,10 @@
{
- "ip": "localhost",
+ "Confirmation needed":"娓呴櫎",
+ "ip":"192.168.10.21",
+ "Mes Connection failed":"Mes杩炴帴澶辫触",
+ "Plc1 Connection failed":"Plc1杩炴帴澶辫触",
+ "Plc2 Connection failed":"Plc2杩炴帴澶辫触",
+ "Remaining width:":"鍓╀綑瀹藉害:",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -35,6 +40,9 @@
"northglassMESsystem": "鍖楃幓MES绯荤粺",
"exit": "閫�鍑�",
"changePassword": "淇敼瀵嗙爜",
+ "Old password":"鏃у瘑鐮�",
+ "New password":"鏂板瘑鐮�",
+ "Confirm password":"鎻愪氦瀵嗙爜",
"resetPassword": "閲嶇疆瀵嗙爜",
"home": "涓婚〉",
"role": "瑙掕壊",
@@ -166,11 +174,16 @@
"B02 OUT pos error": "B02 OUT pos 閿欒"
},
"Electrical": "璁惧绠＄悊",
- "Parameter": "鍙傛暟涓嬪彂",
+ "Parameter": "鍙傛暟璁剧疆",
+ "Manual/Automatic": "鎵嬪姩/鑷姩",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
- "State": "璁惧鐘舵��",
+ "State": "鐘舵��",
"Alarm": "鎶ヨ淇℃伅",
+
+ "Cage Positions":"绗煎瓙瀹氫綅",
+ "PLC-MES Info":"PLC浜や簰",
+
"Distribute": "涓嬪彂",
"Search": "鎼滅储",
"dvstate": {
@@ -228,7 +241,7 @@
"Length": "闀�",
"Width": "瀹�",
"Operate": "鎿嶄綔",
- "Terminate Task":"缁撴潫浠诲姟",
+ "Task Complete":"缁撴潫浠诲姟",
"end task": "瀹屾垚浠诲姟",
"Number": "鏁伴噺",
"Outfeed glass barcode": "鍑虹墖鐜荤拑id",
@@ -246,13 +259,13 @@
"Slot No": "鏍煎瓙",
"Barcode": "鐜荤拑id",
"Delete": "鍒犻櫎",
- "Out": "鍑虹墖",
+ "Outfeed": "鍑虹墖",
"Operation successful": "鎿嶄綔鎴愬姛",
"Operation canceled": "鎿嶄綔鍙栨秷",
"There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
"There are currently tasks": "褰撳墠鏈変换鍔�",
"There is no such glass": "娌℃湁姝ょ幓鐠�",
- "There is no such grid": "娌℃湁绌洪棽鏍煎瓙",
+ "There is no such slot": "娌℃湁绌洪棽鏍煎瓙",
"No delete allowed": "涓嶈兘鍒犻櫎",
"No out allowed": "涓嶈兘鍑虹墖",
"Are you sure to perform this operation ?": "纭畾鎵ц姝ゆ搷浣�?",
@@ -273,32 +286,34 @@
"DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
"Distribute parameters": "涓嬪彂鍙傛暟",
"The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
- "Increase": "娣诲姞",
+ "Add": "娣诲姞",
"Enable": "鍚敤",
"Disable": "绂佺敤",
"Usage": "浣跨敤鐜�",
"Space (Pieces)": "绌洪棿(鐗囨暟)",
"This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
"Enter the Order No": "璇疯緭鍏ヨ鍗昳d",
- "OrderInfo": "璁㈠崟淇℃伅",
+ "Order Info": "璁㈠崟淇℃伅",
"Query": "鏌ヨ",
"permission update": "鏉冮檺缂栬緫",
"query was successful": "鏌ヨ鎴愬姛",
"Scan Code Point": "鎵爜浣�",
"Upper film position": "涓婄墖浣�",
"Glass Information": "鐜荤拑淇℃伅",
- "current Information": "褰撳墠淇℃伅",
- "Modify Information": "淇敼淇℃伅",
+ "D01 Current Information": "D01褰撳墠淇℃伅",
+ "D02 Current Information": "D02褰撳墠淇℃伅",
+ "D01 Modify Information": "D01寰呯‘璁�",
+ "Scan Code Information":"鎵爜淇℃伅",
"Clear Current": "娓呴櫎褰撳墠",
- "Confirm Modification": "纭淇敼",
+ "Confirm": "纭",
"The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
"This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
- "Outing Queue":"鍑虹墖闃熷垪",
+ "Outfeed Queue":"鍑虹墖闃熷垪",
"Enter the Aluminum Frame No":"璇疯緭鍏ラ摑妗唅d",
"Frame No":"閾濇id",
"Glass information corresponding to aluminum frame":"閾濇瀵瑰簲鐨勭幓鐠冧俊鎭�",
"In the cage":"鍦ㄧ鍐�",
- "Flip":"缈昏浆",
+ "Flipped":"缈昏浆",
"In the queue":"鍦ㄩ槦鍒�",
"Enter the Frame No":"璇疯緭鍏ラ摑妗唅d",
"Manually Infeed Glass":"鎵嬪姩杩涚墖",
@@ -316,6 +331,41 @@
"You do not have this permission":"You do not have this permission",
"Unable to find the placement method of the aluminum frame":"鏌ヨ涓嶅埌閾濇鎽嗘斁鏂瑰紡",
"Unable to find whether the aluminum frame is flipped or not":"鏌ヨ涓嶅埌閾濇鏄惁缈昏浆",
+ "This glass is already in the Queue":"姝ょ幓鐠冨凡鍦ㄥ嚭鐗囬槦鍒椾腑",
+ "Complete":"瀹屾垚",
+ "Not Allow":"涓嶅厑璁�",
+ "Allow":"鍏佽",
+ "Completed":"宸插畬鎴�",
+ "Waiting":"绛夊緟涓�",
+ "Deleted":"宸插垹闄�",
+ "Glass State":"鐜荤拑鐘舵��",
+ "Absent":"涓嶅瓨鍦�",
+ "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":"瀹屾垚浠诲姟",
+ "Outed":"宸插嚭绗�",
+ "Queue State":"闃熷垪鐘舵��",
+ "Sorting State":"鎺掑簭鐘舵��",
+ "Confirm State":"纭鐘舵��",
+ "Next":"涓嬩竴涓�",
+ "Current Frame":"褰撳墠閾濇",
+ "Outside":"澶栦晶",
+ "Inside":"鍐呬晶",
+ "Cancel":"鍙栨秷",
+ "Are you sure to clear this barcode ?":"纭畾娓呴櫎姝ょ幓鐠僫d鍚� ?",
+ "Terminate Feeding":"缁堟杩涚墖",
+ "Terminate Outing":"缁堟鍑虹墖",
+ "SoftEmergencyStop":"杞�ュ仠",
+ "Unable to clear glass ID in automatic mode":"鏃犳硶鍦ㄨ嚜鍔ㄦā寮忎笅娓呴櫎鐜荤拑ID",
+ "Are you sure you want an emergency stop ?":"纭畾瑕佹�ュ仠鍚�?",
+ "Current State":"褰撳墠鐘舵��",
+ "Automatic":"鑷姩",
+ "Hand Movement":"鎵嬪姩",
+ "Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
+ "Switch":"鍒囨崲",
+ "This frame has glass that is currently outing":"姝ら摑妗嗘湁姝ｅ湪鍑虹墖鐨勭幓鐠�",
+ "The slot is disabled":"鏍煎瓙琚鐢�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
@@ -372,10 +422,10 @@
"D05.SR in pos": "D05.鍒颁綅浼犳劅鍣�",
"D06.SR dec": "D06.鍑忛�熶紶鎰熷櫒",
"D06.SR in pos": "D06.鍒颁綅浼犳劅鍣�",
- "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
- "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR in dec": "B01.杩涚墖鍑忛�熶紶鎰熷櫒",
"B01.SR in in pos": "B01.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
"B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
@@ -388,21 +438,55 @@
"B02.SR turn off": "B02.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B02.SR up": "B02.涓婂崌鍒颁綅浼犳劅鍣�",
"B02.SR down": "B02.涓嬮檷鍒颁綅浼犳劅鍣�",
- "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
"B01.SR in safety": "B01.杩涚墖瀹夊叏浼犳劅鍣�",
- "B02.SR out safety": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
"SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
"SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
"SB.reset": "SB.澶嶄綅鎸夐挳",
"SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
- "SB.pause": "SB.鏆傚仠鎸夐挳",
+ "D01.SB.confirm": "鐜荤拑淇℃伅纭",
"SB.emg": "SB.鎬ュ仠鎸夐挳",
"D01.SB.start": "D01.鍚姩",
"D06.SB.start": "D06.鍚姩",
- "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
- "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
- "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
- "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+ "B02.SR out safety ": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+ "SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
+ "SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
+ "A01.SR left dec":"A01宸﹂敭閫�",
+ "A01.SR left in pos":"A01宸﹀埌浣�",
+ "A01.SR left safety":"A01宸﹀畨鍏�",
+ "A01.SR right dec":"A01鍙抽敭閫�",
+ "A01.SR right in pos":"A01鍙冲埌浣�",
+ "A01.SR right safety":"A01鍙冲畨鍏�",
+ "A01.SR turn home":"A01缈昏浆鍘熺偣",
+ "A01.SR turn up":"A01缈昏浆涓婃瀬闄�",
+ "A01.SR turn down":"A01缈昏浆涓嬫瀬闄�",
+ "A01.SR travel home":"A01琛岃蛋鍘熺偣",
+ "A01.SR travel left dec":"A01琛岃蛋宸﹀噺閫�",
+ "A01.SR travel left limit":"A01琛岃蛋宸︽瀬闄�",
+ "A01.SR travel right dec":"A01琛岃蛋鍙冲噺閫�",
+ "A01.SR travel right limit":"A01琛岃蛋鍙虫瀬闄�",
+ "A02.SR left dec":"A02宸﹂敭閫�",
+ "A02.SR left in pos":"A02宸﹀埌浣�",
+ "A02.SR left safety":"A02宸﹀畨鍏�",
+ "A02.SR right dec":"A02鍙抽敭閫�",
+ "A02.SR right in pos":"A02鍙冲埌浣�",
+ "A02.SR right safety":"A02鍙冲畨鍏�",
+ "A02.SR turn home":"A02缈昏浆鍘熺偣",
+ "A02.SR turn up":"A02缈昏浆涓婃瀬闄�",
+ "A02.SR turn down":"A02缈昏浆涓嬫瀬闄�",
+ "A02.SR travel home":"A02琛岃蛋鍘熺偣",
+ "A02.SR travel left dec":"A02琛岃蛋宸﹀噺閫�",
+ "A02.SR travel left limit":"A02琛岃蛋宸︽瀬闄�",
+ "A02.SR travel right dec":"A02琛岃蛋鍙冲噺閫�",
+ "A02.SR travel right limit":"A02琛岃蛋鍙虫瀬闄�",
+ "B01.SR origin":"B01.鍘熺偣",
+ "B01.SR left limit":"B01.宸︽瀬闄�",
+ "B01.SR right limit":"B01.鍙虫瀬闄�",
+ "B02.SR origin":"B02.鍘熺偣",
+ "B02.SR left limit":"B02.宸︽瀬闄�",
+ "B02.SR right limit":"B02.鍙虫瀬闄�",
"LED.red": "涓夎壊鐏孩",
"LED.green": "涓夎壊鐏豢",
"LED.yellow": "涓夎壊鐏粍",
@@ -414,8 +498,15 @@
"B02.YV.turn": "B02.鐢电闃�缈昏浆",
"B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
"B02.YV.gassing": "B02.鐢电闃�鍚规皵",
- "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
- "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+ "SafetyDoor.Led": "瀹夊叏闂ㄧ姸鎬佺伅",
+ "SafetyDoor.open": "瀹夊叏闂ㄦ墦寮�",
+ "D01 SB.confirm":"鐜荤拑淇℃伅纭鎸囩ず鐏�",
+ "A01 oilPump":"A01娉ㄦ补娉�",
+ "A01 motorCtr":"A01鐢垫満鎺у埗",
+ "A02 oilPump":"A02娉ㄦ补娉�",
+ "A02 motorCtr":"A02鐢垫満鎺у埗",
+ "space":"澶囩敤"
+
},
"Statelang": {
"D01.State": "D01.鐘舵��",
@@ -428,5 +519,14 @@
"D04.State": "D04.鐘舵��",
"D05.State": "D05.鐘舵��",
"D06.State": "D06.鐘舵��"
- }
+ },
+ "Glass Data":"鑷姩鐘舵��",
+ "ManualJog":"寮�鍏虫帶鍒�",
+ "Manual Control":"鎵嬪姩瀹氫綅",
+ "Servomanualone":"鍗婅嚜鍔�",
+ "Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
+ "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
+ "InteractionState":"浜や簰鐘舵��",
+ "Set":"璁惧畾"
+
}
\ No newline at end of file
--
Gitblit v1.8.0