From 0c5f7c66f34b02c07c3a1bf9832ef402fa26339d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 10:18:11 +0800
Subject: [PATCH] 未回零显示问题
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index cc0008c..d222752 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,5 +1,6 @@
{
- "ip": "localhost",
+ "Clear":"娓呴櫎",
+ "ip":"192.168.10.21",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -35,6 +36,9 @@
"northglassMESsystem": "鍖楃幓MES绯荤粺",
"exit": "閫�鍑�",
"changePassword": "淇敼瀵嗙爜",
+ "Old password":"鏃у瘑鐮�",
+ "New password":"鏂板瘑鐮�",
+ "Confirm password":"鎻愪氦瀵嗙爜",
"resetPassword": "閲嶇疆瀵嗙爜",
"home": "涓婚〉",
"role": "瑙掕壊",
@@ -166,10 +170,10 @@
"B02 OUT pos error": "B02 OUT pos 閿欒"
},
"Electrical": "璁惧绠＄悊",
- "Parameter": "鍙傛暟涓嬪彂",
+ "Parameter": "鍙傛暟璁剧疆",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
- "State": "璁惧鐘舵��",
+ "State": "鐘舵��",
"Alarm": "鎶ヨ淇℃伅",
"Distribute": "涓嬪彂",
"Search": "鎼滅储",
@@ -280,7 +284,7 @@
"Space (Pieces)": "绌洪棿(鐗囨暟)",
"This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
"Enter the Order No": "璇疯緭鍏ヨ鍗昳d",
- "OrderInfo": "璁㈠崟淇℃伅",
+ "Order Info": "璁㈠崟淇℃伅",
"Query": "鏌ヨ",
"permission update": "鏉冮檺缂栬緫",
"query was successful": "鏌ヨ鎴愬姛",
@@ -290,7 +294,7 @@
"current Information": "褰撳墠淇℃伅",
"Modify 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":"鍑虹墖闃熷垪",
@@ -333,6 +337,24 @@
"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 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
@@ -420,7 +442,6 @@
"SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
"SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
"SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
- "Sspce":"澶囩敤",
"A01.SR left dec":"A01宸﹂敭閫�",
"A01.SR left in pos":"A01宸﹀埌浣�",
"A01.SR left safety":"A01宸﹀畨鍏�",
@@ -493,6 +514,8 @@
"ManualonePosition":"鎵嬪姩瀹氫綅",
"Servomanualone":"鍗婅嚜鍔�",
"Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
- "Speed parameter settings":"閫熷害鍙傛暟璁剧疆"
+ "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
+ "InteractionState":"浜や簰鐘舵��",
+ "Set":"璁惧畾"
}
\ No newline at end of file
--
Gitblit v1.8.0