From 5292a401bc26ad177ff5005787429ce036e6457f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 13:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index d473471..c8a4644 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:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
@@ -548,7 +559,6 @@
hollownumber: '涓┖鎬绘暟閲�',
hollowEngineer: '涓┖宸ョ▼',
hollowarea: '涓┖鎬婚潰绉�',
- hollowtotal: '涓┖鎬绘椂闂�',
engineerId: '宸ョ▼鍙�',
totalnumber: '鎬绘暟閲�',
tatalarea: '鎬婚潰绉�',
@@ -798,6 +808,14 @@
finegrinding: '绮剧（',
},
hellow: {
+ taskAlreadyClaimed: '璇ヤ换鍔″凡棰嗗彇锛屼笉鍙噸澶嶆搷浣�',
+ claimed: '宸查鍙�',
+ claimFailed: '棰嗗彇浠诲姟澶辫触',
+ claimedTasksCleared: '宸查鍙栦换鍔＄姸鎬佸凡娓呴櫎',
+ content:'鍐呭',
+ idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+ sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
clickmakesure: '鏄惁纭鐐瑰嚮锛�',
logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
@@ -921,7 +939,8 @@
formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
+ reviewproject: '棰勮浠诲姟',
+ plselectproject: '璇烽�夋嫨浠诲姟',
line: '绾胯矾',
linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
@@ -970,5 +989,38 @@
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
- }
+ },
+ scheduling:{
+ cuttingCount: '鍒囧壊',
+ edgingCount: '纾ㄨ竟',
+ temperingCount: '閽㈠寲',
+ insulatingCount: '涓┖',
+ completed:"宸叉帓浜�",
+ completedCount: '瀹屾垚鏁伴噺',
+ unfinished:'寰呮帓浜�',
+ serial: '搴忓彿',
+ projectNo: '宸ョ▼ID',
+ thickness: '鍘氬害(mm)',
+ glassType: '鐜荤拑绫诲瀷',
+ coatingType: '鑶滅郴',
+ layerCount: '灞傛暟',
+ height: '闀�(mm)',
+ width: '瀹�(mm)',
+ state: '鐘舵��',
+ glassCount: '鏁伴噺',
+ operate: '鎿嶄綔',
+ totalCount: '鎬荤墖鏁�',
+ totalArea: '鎬婚潰绉�(銕�)',
+ remove: '鍘婚櫎',
+ top: '缃《',
+ order: '鍑虹墖椤哄簭',
+ flowCardId: '娴佺▼鍗″彿',
+ add: '娣诲姞',
+ cancelled: '宸插彇娑�',
+ saveFailed: '淇濆瓨鎺掍骇淇℃伅澶辫触',
+ retryLater: '璇风◢鍚庨噸璇�',
+ saveSuccess: '淇濆瓨鎴愬姛',
+ totalFireCount: '鎬荤倝鏁�',
+ fullFireCount: '婊＄倝鏁�',
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0