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 |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 5273df5..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": "瑙掕壊",
@@ -169,7 +173,7 @@
   "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": "鏌ヨ鎴愬姛",
@@ -349,6 +353,8 @@
   "Hand Movement":"鎵嬪姩",
   "Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
   "Switch":"鍒囨崲",
+  "This frame has glass that is currently outing":"姝ら摑妗嗘湁姝e湪鍑虹墖鐨勭幓鐠�",
+  "The slot is disabled":"鏍煎瓙琚鐢�",
   "langparameter": {
     "conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
     "conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
@@ -509,6 +515,7 @@
   "Servomanualone":"鍗婅嚜鍔�",
   "Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
   "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
-  "InteractionState":"浜や簰鐘舵��"
+  "InteractionState":"浜や簰鐘舵��",
+  "Set":"璁惧畾"
 
 }
\ No newline at end of file

--
Gitblit v1.8.0