From 74edb80b30728b2a94389f8bc180229a727f86c8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 26 九月 2023 15:36:34 +0800
Subject: [PATCH] 主界面理片笼添加添加玻璃信息功能，优化界面样式

---
 CanadaMes-ui/src/lang/locales/en-US.json |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 09b53ef..60e56b0 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -228,7 +228,7 @@
 
 
   "Enter the glass lD":"Enter the glass lD",
-  "Manually feed the glass":"Manually feed the glass",
+  "Infeed barcodid":"Infeed barcodid",
   "Enter the order number":"Enter the order number",
   "Exit the glass by order number":"Exit the glass by order number",
   "Please confirm the glass information":"Please confirm the glass information",
@@ -238,28 +238,29 @@
   "order":"order",
   "length":"length",
   "width":"width",
-  "coating":"coating",
   "Operate":"Operate",
   "end task":"end task",
   "cancal":"cancal",
   "confirm":"confirm",
   "number":"number",
-  "Coming out glass ID":"Coming out glass ID",
-  "Incoming glass ID":"Incoming glass ID",
-  "The Cage number being used":"The Cage number being used",
-  "The Grille number being used":"The Grille number being used",
+  "Outfeed Barcodid":"Outfeed Barcodid",
+  "Infeed Barcodid":"Infeed Barcodid",
+  "The Cage number being used":"The Cage Number being used",
+  "The Slot number being used":"The Slot Number being used",
   "Order Nmuber":"Order Nmuber",
-  "Length and width":"Length and width",
+  "Length and Width":"Length and Width",
   "id":"id",
   "content":"content",
   "timeon":"timeon",
   "endTime":"endTime",
 
   "The Cage number":"The Cage number",
-  "tier":"tier",
-  "cell":"cell",
-  "glassid":"glassid",
-  "order number":"order number",
+  "The Side":"The Side",
+  "The Slot Number":"The Slot Number",
+  "Barcodid":"Barcodid",
+  "Order Number":"Order Number",
+  "List Number":"List Number",
+  "Box Number":"Box Number",
   "delete":"delete",
   "out":"out",
 
@@ -274,16 +275,19 @@
   "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
   "prompt":"prompt",
   "Yes":"Yes",
-<<<<<<< .mine
-  "No":"No",
-  "ElectricalPassword":"ElectricalPassword"
+  
 
-
-=======
   "No":"No",
   "Please enter the password":"Please enter the password",
   "Password error":"Password error",
-  "DataBase Connection failed":"DataBase Connection failed"
->>>>>>> .theirs
+  "DataBase Connection failed":"DataBase Connection failed",
+  "Distribute parameters":"Distribute parameters",
+  "The glass size is not within the range":"The glass size is not within the range",
+  "increase":"increase",
+  "Enable":"Enable",
+  "Disable":"Disable",
+  "Usage":"Usage",
+  "Space (Pieces)":"Space (Pieces)",
+  "This glass is already in the cage":"This glass is already in the cage"
 
 }
\ No newline at end of file

--
Gitblit v1.8.0