From 75b98831417be414bc43e1832479d05d20cf6ac3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 UI-Project/src/lang/en.js |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index d9bbb3d..ae61ddc 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,12 @@
           quit:"Exit",
       },
       basicData:{
+          untask:'鏃犱换鍔�',
+          up:'涓婄墖',
+          tonumber:'涓婄墖鎬绘暟閲�',
+          finishnumber:'宸插畬鎴愭暟閲�',
+          rackreset:'鏋跺瓙澶嶄綅',
+          prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
           printing:'鑷姩鎵撳嵃',
           laserprinting:'Laser printing machine ready status锛�',
           cuttingmachine:'Cutting machine ready status锛�',
@@ -94,6 +100,9 @@
           emptymissions:'绌轰换鍔�',
           advancetask:'杩涚墖浠诲姟',
           outputtasks:'鍑虹墖浠诲姟',
+          schedulingtasks:'璋冨害浠诲姟',
+          advancerequests:'杩涚墖璇锋眰',
+          releaserequest:'鍑虹墖璇锋眰',
           straighttasks:'鐩撮�氫换鍔�',
           endingtask:'缁撴潫',
           another:'鍏朵粬',
@@ -127,6 +136,24 @@
           takeon:'The arrangement is complete',
       },
       searchOrder:{
+          begin:'寮�濮�',
+          finish:'瀹屾垚',
+          uncar:'鏈笂杞�',
+          inkage:'杩涚墖',
+          successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+          psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+          taskfailure:'浠诲姟澶辫触澶勭悊',
+          ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+          totallogarithms:'鎬诲鏁�',
+          numberpairs:'閰嶅鏁�',
+          numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+          totalfurnaces:'鎬荤倝鏁�',
+          cagesnumber:'绗煎唴鏁伴噺',
+          slotnumber:'鍗犳湁鏍煎瓙鏁�',
+          progress:'杩涘害%',
+          whethersame:'鏄惁鐩稿悓',
+          same:'鐩稿悓',
+          notsame:'涓嶇浉鍚�',
           partask:'浠诲姟閲嶇疆',
           partasks:'鏄惁浠诲姟閲嶇疆锛�',
           empty:'榛樿绌轰换鍔�',
@@ -274,6 +301,8 @@
           Schedulingswitch:'璋冨害寮�鍏�',
       },
       workOrder:{
+          upnumber:'涓婄墖浣嶇紪鍙�',
+          coatingtypesbe:'鍘熺墖鑶滅郴',
           glassID:'Glass ID',
           height:'Height',
           width:'Width',
@@ -476,6 +505,7 @@
           createTime :'Return date',
       },
       large:{
+          percent:'Percent',
           time: 'The time of the break',
           number: 'Order number',
           jobnumber: 'Job number',
@@ -546,6 +576,7 @@
           dreportwork :'Unreported work',
           pendingwork :'Pending job application',
           reportwork :'Reported work',
+          reportworked :'Reported worked',
           incise :'slicing',
           edging :'edging',
           steel :'toughened',
@@ -579,6 +610,8 @@
           premark :'Please enter a note',
       },
       film:{
+          resetnumber:'鏋跺瓙鍙�',
+          fail:'澶辫触',
           mes:'Original film storage details',
           warehousing:'store',
           pwarehousing:'鍏ュ簱璇锋眰',
@@ -617,6 +650,7 @@
           filmsa:'Films锛�',
           createtime:'Creation time',
           remainquantity:'Remaining Quantity',
+          thickremainquant:'Remaining quantity of original film (sheets)',
           thickremainquantity:'Remaining quantity of original film (sheets)锛�',
           inquantity:'Please enter the quantity',
           quantitya:'Number锛�',
@@ -811,5 +845,10 @@
           pairQuantity: '鎬婚厤瀵规暟閲忥細',
           cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
           schedulingswitch: '璋冨害寮�鍏�',
-      }
+      },
+    screendisplay:{
+        pwidth: '璇疯緭鍏ュ搴�',
+        pheight: '璇疯緭鍏ラ珮搴�',
+        upnumber: '涓婄墖鏁伴噺',
+    }
   }
\ No newline at end of file

--
Gitblit v1.8.0