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 | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fed94a3..197fd40 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,10 @@
{
- "Clear":"娓呴櫎",
- "ip":"10.168.10.21",
+ "Confirmation needed":"娓呴櫎",
+ "ip":"192.168.10.21",
+ "Mes Connection failed":"Mes杩炴帴澶辫触",
+ "Plc1 Connection failed":"Plc1杩炴帴澶辫触",
+ "Plc2 Connection failed":"Plc2杩炴帴澶辫触",
+ "Remaining width:":"鍓╀綑瀹藉害:",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -171,10 +175,15 @@
},
"Electrical": "璁惧绠＄悊",
"Parameter": "鍙傛暟璁剧疆",
+ "Manual/Automatic": "鎵嬪姩/鑷姩",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
"State": "鐘舵��",
"Alarm": "鎶ヨ淇℃伅",
+
+ "Cage Positions":"绗煎瓙瀹氫綅",
+ "PLC-MES Info":"PLC浜や簰",
+
"Distribute": "涓嬪彂",
"Search": "鎼滅储",
"dvstate": {
@@ -232,7 +241,7 @@
"Length": "闀�",
"Width": "瀹�",
"Operate": "鎿嶄綔",
- "Terminate Task":"缁撴潫浠诲姟",
+ "Task Complete":"缁撴潫浠诲姟",
"end task": "瀹屾垚浠诲姟",
"Number": "鏁伴噺",
"Outfeed glass barcode": "鍑虹墖鐜荤拑id",
@@ -250,7 +259,7 @@
"Slot No": "鏍煎瓙",
"Barcode": "鐜荤拑id",
"Delete": "鍒犻櫎",
- "Out": "鍑虹墖",
+ "Outfeed": "鍑虹墖",
"Operation successful": "鎿嶄綔鎴愬姛",
"Operation canceled": "鎿嶄綔鍙栨秷",
"There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
@@ -291,13 +300,15 @@
"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": "纭",
"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":"閾濇瀵瑰簲鐨勭幓鐠冧俊鎭�",
@@ -509,9 +520,9 @@
"D05.State": "D05.鐘舵��",
"D06.State": "D06.鐘舵��"
},
- "Automatic State":"鑷姩鐘舵��",
+ "Glass Data":"鑷姩鐘舵��",
"ManualJog":"寮�鍏虫帶鍒�",
- "ManualonePosition":"鎵嬪姩瀹氫綅",
+ "Manual Control":"鎵嬪姩瀹氫綅",
"Servomanualone":"鍗婅嚜鍔�",
"Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
"Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
--
Gitblit v1.8.0