From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/zh.js |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 9fb23b6..36c3c5d 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -128,12 +128,20 @@
       },
       order:{
           projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
+          noGlassToDamage:'娌℃湁鍙牬鎹熺殑鐜荤拑锛�',
           dilapidation:'鐮存崯',
+          dilapidationDetails:'鐮存崯璇︽儏',
+          dilapidationAll:'涓�閿牬鎹�',
+          dilapidationWhether:'鏄惁涓�閿牬鎹燂紵',
           takeaway:'浜哄伐鎷胯蛋',
           takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
           takeon:'鎽嗙墖瀹屾垚',
       },
       searchOrder:{
+          loadingText: '鏁版嵁鍔犺浇涓紝璇风◢鍊�...',
+          firstLinePriority: '涓�绾夸紭鍏�',
+          secondLinePriority: '浜岀嚎浼樺厛',
+          hollowPriority:'涓┖浼樺厛绾�',
           furnaces:'婊＄倝鐐夋暟',
           furnfullTemp:'鐜荤拑鎬婚噺',
           startCell:'鐩爣灞傚彿',
@@ -231,6 +239,7 @@
           startstatus:'鍚敤鐘舵��',
           startstatusa:'鍚敤鐘舵�侊細',
           instartstatus:'璇疯緭鍏ュ惎鐢ㄧ姸鎬�',
+          choicestartstatus:'璇烽�夋嫨鍚敤鐘舵��',
           glassgaps:'鐜荤拑闂撮殭',
           glassgapsa:'鐜荤拑闂撮殭锛�',
           inglassgaps:'璇疯緭鍏ョ幓鐠冮棿闅�',
@@ -332,6 +341,8 @@
           finedging:'宸茬（杈�',
       },
       processCard:{
+          thisIsTheIndoorSurface: '姝ら潰涓哄鍐呴潰',
+          thisSideIsOutsideTheRoom: '姝ら潰涓哄澶栭潰',
           intofurnace:'杩涚倝涓�',
           beforefurnace:'杩涚倝鍓�',
           outfurnace:'宸插嚭鐐夌幓鐠�',
@@ -405,6 +416,7 @@
           configNamea:'閰嶇疆鍚嶏細',
           configCode:'閰嶇疆浠ｇ爜',
           configValue:'閰嶇疆鍊�',
+          inconfigValue:'璇疯緭鍏ラ厤缃��',
           configValuea:'閰嶇疆鍊硷細',
           addusers:'娣诲姞鐢ㄦ埛',
           username:'鐢ㄦ埛鍚�',
@@ -513,6 +525,7 @@
           createTime :'杩斿簱鏃ユ湡',
       },
       large:{
+        patchCount:'宸茶ˉ鏁伴噺',
         Productionsituation:'鐢熶骇鎯呭喌',
         Productionandoperationstatus:'鐢熶骇杩愯鎯呭喌',
         cuttingState:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
@@ -575,6 +588,7 @@
           building: '妤煎彿',
           serialnumber: '璁㈠崟搴忓彿',
           productname: '浜у搧鍚嶇О',
+          inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
           serial: '宸ヨ壓纭搴忓彿',
           slicemarker: '灞傚彿',
           numberpatches: '琛ョ墖鏁伴噺',
@@ -599,6 +613,7 @@
           orderId: '璁㈠崟ID',
           order: '璁㈠崟璇︽儏',
           customerName: '瀹㈡埛鍚嶇О',
+          incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
           project: '椤圭洰鍚嶇О',
           are: '闈㈢Н',
           quantity: '鏁伴噺',
@@ -794,6 +809,14 @@
           finegrinding: '绮剧（',
       },
     hellow: {
+        taskAlreadyClaimed: '璇ヤ换鍔″凡棰嗗彇锛屼笉鍙噸澶嶆搷浣�',
+        claimed: '宸查鍙�',
+        claimFailed: '棰嗗彇浠诲姟澶辫触',
+        claimedTasksCleared: '宸查鍙栦换鍔＄姸鎬佸凡娓呴櫎',
+        content:'鍐呭',
+        idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+        sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+        projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
         clickmakesure: '鏄惁纭鐐瑰嚮锛�',
         logarithm: '瀵规暟锛�',
         totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
@@ -917,7 +940,8 @@
         formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
         stopproject: '鏆傚仠浠诲姟',
         pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
-        reviewproject: '棰勮宸ョ▼',
+        reviewproject: '棰勮浠诲姟',
+        plselectproject: '璇烽�夋嫨浠诲姟',
         line: '绾胯矾',
         linea: '绾胯矾锛�',
         line1: '绾胯矾涓�',
@@ -944,6 +968,7 @@
         layernumber: '灞傚彿',
         totalnumber: '鎬荤墖鏁�',
         pairsnumber: '宸查厤瀵规暟閲�',
+        pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
         missingnumber: '缂虹墖鏁伴噺',
         damagenumber: '鐮存崯鏁伴噺',
         operate: '鎿嶄綔',
@@ -965,5 +990,5 @@
         pwidth: '璇疯緭鍏ュ搴�',
         pheight: '璇疯緭鍏ラ珮搴�',
         upnumber: '涓婄墖鏁伴噺',
-    }
+    } 
 }
\ No newline at end of file

--
Gitblit v1.8.0