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 | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 4d290ea..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:'鐩爣灞傚彿',
@@ -333,6 +341,8 @@
finedging:'宸茬（杈�',
},
processCard:{
+ thisIsTheIndoorSurface: '姝ら潰涓哄鍐呴潰',
+ thisSideIsOutsideTheRoom: '姝ら潰涓哄澶栭潰',
intofurnace:'杩涚倝涓�',
beforefurnace:'杩涚倝鍓�',
outfurnace:'宸插嚭鐐夌幓鐠�',
@@ -515,6 +525,7 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ patchCount:'宸茶ˉ鏁伴噺',
Productionsituation:'鐢熶骇鎯呭喌',
Productionandoperationstatus:'鐢熶骇杩愯鎯呭喌',
cuttingState:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
@@ -577,6 +588,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
@@ -601,6 +613,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '鏁伴噺',
@@ -796,6 +809,14 @@
finegrinding: '绮剧（',
},
hellow: {
+ taskAlreadyClaimed: '璇ヤ换鍔″凡棰嗗彇锛屼笉鍙噸澶嶆搷浣�',
+ claimed: '宸查鍙�',
+ claimFailed: '棰嗗彇浠诲姟澶辫触',
+ claimedTasksCleared: '宸查鍙栦换鍔＄姸鎬佸凡娓呴櫎',
+ content:'鍐呭',
+ idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+ sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
clickmakesure: '鏄惁纭鐐瑰嚮锛�',
logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
@@ -919,7 +940,8 @@
formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
+ reviewproject: '棰勮浠诲姟',
+ plselectproject: '璇烽�夋嫨浠诲姟',
line: '绾胯矾',
linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
@@ -946,6 +968,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
--
Gitblit v1.8.0