From ab458edbd053107077ae95acaca214ffb1d37828 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十一月 2023 09:20:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 284 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 193 insertions(+), 91 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fa58c91..0b55a8b 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -196,10 +196,8 @@
"langResetButton": "閲嶇疆",
"langCancelButton": "鍙栨秷",
"langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
-
- "娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
+ "娣诲姞鐢ㄦ埛鎴愬姛": "娣诲姞鐢ㄦ埛鎴愬姛",
"confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
-
"confirm": "纭畾",
"cancel": "鍙栨秷",
"passwordResetSuccess": "瀵嗙爜宸查噸缃负榛樿鍊�",
@@ -210,67 +208,60 @@
"addUserSuccess": "娣诲姞鐢ㄦ埛鎴愬姛",
"editUserSuccess": "淇敼鐢ㄦ埛鎴愬姛",
"effective": "鏈夋晥",
-"invalid": "鏃犳晥",
-
-"addSuccessMessage": "娣诲姞鎴愬姛",
-"deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
-
-"confirmButtonText": "纭畾",
-"cancelButtonText": "鍙栨秷",
-"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
-"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
-
-
-
- "Enter the glass lD":"杈撳叆鐜荤拑id",
- "Infeed barcodid":"鎵嬪姩涓婄墖",
- "Enter the order number":"杈撳叆璁㈠崟鍙�",
- "Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
- "Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
- "Please confirm the Ordering Information":"璇风‘璁よ鍗曚俊鎭�",
- "Alarm Information":"鎶ヨ淇℃伅",
- "Cage Details":"鐞嗙墖绗艰鎯�",
- "order":"璁㈠崟",
- "length":"闀�",
- "width":"瀹�",
- "Operate":"鎿嶄綔",
- "end task":"瀹屾垚浠诲姟",
- "cancel":"鍙栨秷",
- "confirm":"纭",
- "number":"鏁伴噺",
- "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
- "Infeed Barcodid":"杩涚墖鐜荤拑id",
- "The Cage number being used":"绗煎瓙",
- "The Slot number being used":"鏍煎瓙",
- "Order Nmuber":"璁㈠崟缂栧彿",
- "List Number":"鍒楄〃缂栧彿",
- "Box Number":"绠卞瓙缂栧彿",
- "Length and Width":"灏哄",
- "id":"id",
- "content":"鍐呭",
- "timeon":"鎶ヨ鏃堕棿",
- "endTime":"缁撴潫鏃堕棿",
-
- "The Cage number":"绗煎瓙",
- "The Side":"鍐呭渚�",
- "The Slot Number":"鏍煎瓙",
- "Barcodid":"鐜荤拑id",
- "Order Number":"璁㈠崟",
- "delete":"鍒犻櫎",
- "out":"鍑虹墖",
-
- "Operation successful":"鎿嶄綔鎴愬姛",
- "Operation canceled":"鎿嶄綔鍙栨秷",
- "There is no such order":"娌℃湁姝よ鍗曠殑鐜荤拑",
- "There are currently tasks":"褰撳墠鏈変换鍔�",
- "There is no such glass":"娌℃湁姝ょ幓鐠�",
- "There is no such grid":"娌℃湁绌洪棽鏍煎瓙",
- "No delete allowed":"涓嶈兘鍒犻櫎",
- "No out allowed":"涓嶈兘鍑虹墖",
- "Are you sure to perform this operation ?":"纭畾鎵ц姝ゆ搷浣�?",
- "prompt":"鎻愮ず",
- "Yes":"鏄�",
- "No":"鍚�",
+ "invalid": "鏃犳晥",
+ "addSuccessMessage": "娣诲姞鎴愬姛",
+ "deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
+ "confirmButtonText": "纭畾",
+ "cancelButtonText": "鍙栨秷",
+ "deleteSuccessMessage": "鍒犻櫎鎴愬姛",
+ "deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
+ "Enter the glass lD": "杈撳叆鐜荤拑id",
+ "Infeed barcodid": "鎵嬪姩涓婄墖",
+ "Enter the order number": "杈撳叆璁㈠崟鍙�",
+ "Exit the glass by order number": "鎸夎鍗曞嚭鐗�",
+ "Please confirm the glass information": "璇风‘璁ょ幓鐠冧俊鎭�",
+ "Please confirm the Ordering Information": "璇风‘璁よ鍗曚俊鎭�",
+ "Alarm Information": "鎶ヨ淇℃伅",
+ "Cage Details": "鐞嗙墖绗艰鎯�",
+ "order": "璁㈠崟",
+ "length": "闀�",
+ "width": "瀹�",
+ "Operate": "鎿嶄綔",
+ "end task": "瀹屾垚浠诲姟",
+ "cancel": "鍙栨秷",
+ "confirm": "纭",
+ "number": "鏁伴噺",
+ "Outfeed Barcodid": "鍑虹墖鐜荤拑id",
+ "Infeed Barcodid": "杩涚墖鐜荤拑id",
+ "The Cage number being used": "绗煎瓙",
+ "The Slot number being used": "鏍煎瓙",
+ "Order Nmuber": "璁㈠崟缂栧彿",
+ "List Number": "鍒楄〃缂栧彿",
+ "Box Number": "绠卞瓙缂栧彿",
+ "Length and Width": "灏哄",
+ "id": "id",
+ "content": "鍐呭",
+ "timeon": "鎶ヨ鏃堕棿",
+ "endTime": "缁撴潫鏃堕棿",
+ "The Cage number": "绗煎瓙",
+ "The Side": "鍐呭渚�",
+ "The Slot Number": "鏍煎瓙",
+ "Barcodid": "鐜荤拑id",
+ "Order Number": "璁㈠崟",
+ "delete": "鍒犻櫎",
+ "out": "鍑虹墖",
+ "Operation successful": "鎿嶄綔鎴愬姛",
+ "Operation canceled": "鎿嶄綔鍙栨秷",
+ "There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
+ "There are currently tasks": "褰撳墠鏈変换鍔�",
+ "There is no such glass": "娌℃湁姝ょ幓鐠�",
+ "There is no such grid": "娌℃湁绌洪棽鏍煎瓙",
+ "No delete allowed": "涓嶈兘鍒犻櫎",
+ "No out allowed": "涓嶈兘鍑虹墖",
+ "Are you sure to perform this operation ?": "纭畾鎵ц姝ゆ搷浣�?",
+ "prompt": "鎻愮ず",
+ "Yes": "鏄�",
+ "No": "鍚�",
"today": "浠婂ぉ",
"yesterday": "鏄ㄥぉ",
"week": "涓�鍛ㄥ墠",
@@ -280,31 +271,142 @@
"alacontent": "鎶ヨ鍐呭",
"time-on": "寮�濮嬫椂闂�",
"End-Time": "缁撴潫鏃堕棿",
-
- "Please enter the password":"璇疯緭鍏ュ瘑鐮�",
- "Password error":"瀵嗙爜閿欒",
- "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�",
- "Distribute parameters":"涓嬪彂鍙傛暟",
- "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
- "increase":"娣诲姞",
- "Enable":"鍚敤",
- "Disable":"绂佺敤",
- "Usage":"浣跨敤鐜�",
- "Space (Pieces)":"绌洪棿(鐗囨暟)",
- "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
- "Enter the Order lD":"璇疯緭鍏ヨ鍗昳d",
- "OrderInfo":"璁㈠崟淇℃伅",
- "Query":"鏌ヨ",
- "permission update":"鏉冮檺缂栬緫",
- "query was successful":"鏌ヨ鎴愬姛",
- "Scan Code Point":"鎵爜浣�",
- "Upper film position":"涓婄墖浣�",
- "Glass Information":"鐜荤拑淇℃伅",
- "current Information":"褰撳墠淇℃伅",
- "Modify Information":"淇敼淇℃伅",
- "Clear Current":"娓呴櫎褰撳墠",
- "Confirm Modification":"纭淇敼",
- "The glass ID already exists in the loading queue":"涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
- "This glass ID already exists in the sorting cage":"鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id"
-
+ "Please enter the password": "璇疯緭鍏ュ瘑鐮�",
+ "Password error": "瀵嗙爜閿欒",
+ "DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
+ "Distribute parameters": "涓嬪彂鍙傛暟",
+ "The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
+ "increase": "娣诲姞",
+ "Enable": "鍚敤",
+ "Disable": "绂佺敤",
+ "Usage": "浣跨敤鐜�",
+ "Space (Pieces)": "绌洪棿(鐗囨暟)",
+ "This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
+ "Enter the Order lD": "璇疯緭鍏ヨ鍗昳d",
+ "OrderInfo": "璁㈠崟淇℃伅",
+ "Query": "鏌ヨ",
+ "permission update": "鏉冮檺缂栬緫",
+ "query was successful": "鏌ヨ鎴愬姛",
+ "Scan Code Point": "鎵爜浣�",
+ "Upper film position": "涓婄墖浣�",
+ "Glass Information": "鐜荤拑淇℃伅",
+ "current Information": "褰撳墠淇℃伅",
+ "Modify Information": "淇敼淇℃伅",
+ "Clear Current": "娓呴櫎褰撳墠",
+ "Confirm Modification": "纭淇敼",
+ "The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
+ "This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
+ "langparameter": {
+ "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
+ "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
+ "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+ "A01 A02 TURN JOG Velocity": "A01 A02 缈昏浆鐐瑰姩閫熷害",
+ "A01 A02 TRAVEL JOG Velocity": "A01 A02 琛岃蛋鐐瑰姩閫熷害",
+ "B01 B02 TRAVEL JOG Velocity": "B01 B02 琛岃蛋鐐瑰姩閫熷害",
+ "A01 A02 TURN POS Velocity AUTO": "A01 A02 缈昏浆鑷姩瀹氫綅閫熷害",
+ "A01 A02 TURN POS Velocity manual": "A01 A02 缈昏浆鎵嬪姩瀹氫綅閫熷害",
+ "A01 A02 TRAVEL POS Velocity AUTO": "A01 A02 琛岃蛋鑷姩瀹氫綅閫熷害",
+ "A01 A02 TRAVEL POS Velocity manual": "A01 A02 琛岃蛋鎵嬪姩瀹氫綅閫熷害",
+ "B01 B02 TRAVEL POS Velocity AUTO": "B01 B02 琛岃蛋鑷姩瀹氫綅閫熷害",
+ "B01 B02 TRAVEL POS Velocity manual": "B01 B02 琛岃蛋鎵嬪姩瀹氫綅閫熷害"
+ },
+ "langActions": {
+ "D01 VFD conveyor": "D01 杈撻�佸彉棰�",
+ "D02 VFD conveyor": "D02 杈撻�佸彉棰�",
+ "D03 VFD conveyor": "D03 杈撻�佸彉棰�",
+ "D04 VFD conveyor": "D04 杈撻�佸彉棰�",
+ "D05 VFD conveyor": "D05 杈撻�佸彉棰�",
+ "D06 VFD conveyor": "D06 杈撻�佸彉棰�",
+ "A01 VFD conveyor": "A01 杈撻�佸彉棰�",
+ "A02 VFD conveyor": "A02 杈撻�佸彉棰�",
+ "B01 VFD conveyor": "B01 杈撻�佸彉棰�",
+ "B02 VFD conveyor": "B02 杈撻�佸彉棰�",
+ "A01 SERVE TURN JOG+": "A01 缈昏浆浼烘湇鐐瑰姩",
+ "A02 SERVE TURN JOG-": "A02 缈昏浆浼烘湇鐐瑰姩",
+ "A01 SERVE TRAVEL JOG+": "A01 琛岃蛋浼烘湇鐐瑰姩",
+ "A02 SERVE TRAVEL JOG-": "A02 琛岃蛋浼烘湇鐐瑰姩",
+ "B01 SERVE TRAVEL JOG+": "B01 琛岃蛋浼烘湇鐐瑰姩",
+ "B02 SERVE TRAVEL JOG-": "B02 琛岃蛋浼烘湇鐐瑰姩",
+ "A01 SERVE TURN POS": "A01 缈昏浆浼烘湇瀹氫綅",
+ "A02 SERVE TURN POS": "A02 缈昏浆浼烘湇瀹氫綅",
+ "A01 SERVE TRAVEL POS": "A01 琛岃蛋浼烘湇瀹氫綅",
+ "A02 SERVE TRAVEL POS": "A02 琛岃蛋浼烘湇瀹氫綅",
+ "B01 SERVE TRAVEL POS": "B01 琛岃蛋浼烘湇瀹氫綅",
+ "B02 SERVE TRAVEL POS": "B02 琛岃蛋浼烘湇瀹氫綅",
+ "B01 YV TURN": "B01 鎶捣鐢电闃�",
+ "B01 YV UP DOWN": "B01 涓婂崌涓嬮檷鐢电闃�",
+ "B02 YV TURN": "B02 鎶捣鐢电闃�",
+ "B02 YV UP DOWN": "B02 涓婂崌涓嬮檷鐢电闃�"
+ },
+ "Signlang": {
+ "D01.SR dec": "D01.鍑忛�熶紶鎰熷櫒",
+ "D01.SR in pos": "D01.鍒颁綅浼犳劅鍣�",
+ "D02.SR dec": "D02.鍑忛�熶紶鎰熷櫒",
+ "D02.SR in pos": "D02.鍒颁綅浼犳劅鍣�",
+ "D03.SR into": "D03.杩涚墖浼犳劅鍣�",
+ "D03.SR dec": "D03.鍑忛�熶紶鎰熷櫒",
+ "D03.SR in pos": "D03.鍒颁綅浼犳劅鍣�",
+ "D04.SR dec": "D04.鍑忛�熶紶鎰熷櫒",
+ "D04.SR in pos": "D04.鍒颁綅浼犳劅鍣�",
+ "D05.SR dec": "D05.鍑忛�熶紶鎰熷櫒",
+ "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 turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+ "B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
+ "B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
+ "B01.SR down": "B01.涓嬮檷鍒颁綅浼犳劅鍣�",
+ "B02.SR out dec": "B02.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B02.SR out in pos": "B02.鍑虹墖鍒颁綅浼犳劅鍣�",
+ "B02.SR in dec": "B02.杩涚墖鍑忛�熶紶鎰熷櫒",
+ "B02.SR in in pos": "B02.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B02.SR turn on": "B02.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+ "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.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
+ "SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
+ "SB.reset": "SB.澶嶄綅鎸夐挳",
+ "SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
+ "SB.pause": "SB.鏆傚仠鎸夐挳",
+ "SB.emg": "SB.鎬ュ仠鎸夐挳",
+ "D01.SB.start": "D01.鍚姩",
+ "D06.SB.start": "D06.鍚姩",
+ "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
+ "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+ "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
+ "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+ "LED.red": "涓夎壊鐏孩",
+ "LED.green": "涓夎壊鐏豢",
+ "LED.yellow": "涓夎壊鐏粍",
+ "D01.LED.green": "D01.缁跨伅",
+ "D06.LED.green": "D06.缁跨伅",
+ "B01.YV.turn": "B01.鐢电闃�缈昏浆",
+ "B01.YV.up down": "B01.鐢电闃�涓婂崌涓嬮檷",
+ "B01.YV.gassing": "B01.鐢电闃�鍚规皵",
+ "B02.YV.turn": "B02.鐢电闃�缈昏浆",
+ "B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
+ "B02.YV.gassing": "B02.鐢电闃�鍚规皵",
+ "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
+ "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+ },
+ "Statelang": {
+ "D01.State": "D01.鐘舵��",
+ "D02.State": "D02.鐘舵��",
+ "B01.State": "B01.鐘舵��",
+ "B02.State": "B02.鐘舵��",
+ "A01.State": "A01.鐘舵��",
+ "A02.State": "A02.鐘舵��",
+ "D03.State": "D03.鐘舵��",
+ "D04.State": "D04.鐘舵��",
+ "D05.State": "D05.鐘舵��",
+ "D06.State": "D06.鐘舵��"
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0