From 63100c0391d3a4f1d41ac5e580625913b2edd265 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 04 十一月 2025 13:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 1580d29..7a4d0e9 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -36,6 +36,7 @@
basicData:{
untask:'鏃犱换鍔�',
tonumber:'涓婄墖鎬绘暟閲�',
+ sectionUpperSuccessful:'涓婄墖鎿嶄綔鎴愬姛锛�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
@@ -128,12 +129,20 @@
},
order:{
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
+ noGlassToDamage:'娌℃湁鍙牬鎹熺殑鐜荤拑锛�',
dilapidation:'鐮存崯',
+ dilapidationDetails:'鐮存崯璇︽儏',
+ dilapidationAll:'涓�閿牬鎹�',
+ dilapidationWhether:'鏄惁涓�閿牬鎹燂紵',
takeaway:'浜哄伐鎷胯蛋',
takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ loadingText: '鏁版嵁鍔犺浇涓紝璇风◢鍊�...',
+ firstLinePriority: '涓�绾夸紭鍏�',
+ secondLinePriority: '浜岀嚎浼樺厛',
+ hollowPriority:'涓┖浼樺厛绾�',
furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
@@ -231,6 +240,7 @@
startstatus:'鍚敤鐘舵��',
startstatusa:'鍚敤鐘舵�侊細',
instartstatus:'璇疯緭鍏ュ惎鐢ㄧ姸鎬�',
+ choicestartstatus:'璇烽�夋嫨鍚敤鐘舵��',
glassgaps:'鐜荤拑闂撮殭',
glassgapsa:'鐜荤拑闂撮殭锛�',
inglassgaps:'璇疯緭鍏ョ幓鐠冮棿闅�',
@@ -332,6 +342,8 @@
finedging:'宸茬（杈�',
},
processCard:{
+ thisIsTheIndoorSurface: '姝ら潰涓哄鍐呴潰',
+ thisSideIsOutsideTheRoom: '姝ら潰涓哄澶栭潰',
intofurnace:'杩涚倝涓�',
beforefurnace:'杩涚倝鍓�',
outfurnace:'宸插嚭鐐夌幓鐠�',
@@ -405,6 +417,7 @@
configNamea:'閰嶇疆鍚嶏細',
configCode:'閰嶇疆浠ｇ爜',
configValue:'閰嶇疆鍊�',
+ inconfigValue:'璇疯緭鍏ラ厤缃��',
configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
@@ -457,6 +470,11 @@
prompt:'鎻愮ず',
},
delivery:{
+ alarmStartTime:'鎶ヨ寮�濮嬫椂闂�',
+ alarmEndTime:'鎶ヨ缁撴潫鏃堕棿',
+ equipment:'璁惧',
+ content:'鍐呭',
+ confirmer:'纭浜�',
addrole:'娣诲姞瑙掕壊',
editrole:'淇敼瑙掕壊',
role :'瑙掕壊',
@@ -513,6 +531,44 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ patchCount:'宸茶ˉ鏁伴噺',
+ Productionsituation:'鐢熶骇鎯呭喌',
+ Productionandoperationstatus:'鐢熶骇杩愯鎯呭喌',
+ cuttingState:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
+ edgingState:'纾ㄨ竟褰撳ぉ杩愯鎯呭喌',
+ temperingState:'閽㈠寲褰撳ぉ杩愯鎯呭喌',
+ hollowState:'涓┖褰撳ぉ杩愯鎯呭喌',
+ switch:'鍒囨崲',
+ running:'杩愯涓�',
+ stopping:'鍋滄',
+ diffMinutes:'鍒嗛挓',
+ loadstart:'鍒囧壊寮�濮嬫椂闂�',
+ loadend:'鍒囧壊缁撴潫鏃堕棿',
+ loadtotal: '鍒囧壊鎬绘椂闂�',
+ loadfree: '鍒囧壊绌洪棽鏃堕棿',
+ loaddiff: '鍒囧壊宸ヤ綔鏃堕棿',
+ loadnumber: '鍒囧壊鎬绘暟閲�',
+ loadarea: '鍒囧壊鎬婚潰绉�',
+ tempstart: '閽㈠寲寮�濮嬫椂闂�',
+ tempend: '閽㈠寲缁撴潫鏃堕棿',
+ temptotal: '閽㈠寲鎬绘椂闂�',
+ tempfree: '閽㈠寲绌洪棽鏃堕棿',
+ tempdiff: '閽㈠寲宸ヤ綔鏃堕棿',
+ tempstove: '閽㈠寲鐐夊彿',
+ tempnumber: '閽㈠寲鎬绘暟閲�',
+ temparea: '閽㈠寲鎬婚潰绉�',
+ hollowstart: '涓┖寮�濮嬫椂闂�',
+ hollowend: '涓┖缁撴潫鏃堕棿',
+ hollowtotal: '涓┖鎬绘椂闂�',
+ hollowfree: '涓┖绌洪棽鏃堕棿',
+ hollowdiff: '涓┖宸ヤ綔鏃堕棿',
+ hollownumber: '涓┖鎬绘暟閲�',
+ hollowEngineer: '涓┖宸ョ▼',
+ hollowarea: '涓┖鎬婚潰绉�',
+ engineerId: '宸ョ▼鍙�',
+ totalnumber: '鎬绘暟閲�',
+ tatalarea: '鎬婚潰绉�',
+
statistics: '鐢熶骇缁熻',
ExporttoExcel:'瀵煎嚭excel',
slice:'鐗�',
@@ -537,6 +593,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
@@ -561,6 +618,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '鏁伴噺',
@@ -599,17 +657,17 @@
historicaltasks9:'涓┖澶х悊鐗�',
historicaltasks10:'鐢熶骇缁熻',
date:'鏃ユ湡',
- countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ countOutOne: '鍒囧壊涓�绾�',
totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
- countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ countOutTwo: '鍒囧壊浜岀嚎',
totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
- countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖',
totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
- countOut: '閽㈠寲鏁伴噺',
+ countOut: '閽㈠寲',
totalAreaOut: '閽㈠寲闈㈢Н',
- hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowCountOutOne: '涓┖涓�绾�',
hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
- hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowCountOutTwo: '涓┖浜岀嚎',
hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
@@ -756,6 +814,17 @@
finegrinding: '绮剧（',
},
hellow: {
+ taskAlreadyClaimed: '璇ヤ换鍔″凡棰嗗彇锛屼笉鍙噸澶嶆搷浣�',
+ claimed: '宸查鍙�',
+ claimFailed: '棰嗗彇浠诲姟澶辫触',
+ claimedTasksCleared: '宸查鍙栦换鍔＄姸鎬佸凡娓呴櫎',
+ content:'鍐呭',
+ idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+ sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+ slotLess:'鍓╀綑鏍煎瓙涓嶈冻',
+ overSize:'鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖',
+ noGlass:'鏈壘鍒扮幓鐠冧俊鎭紝璇烽鍙栧伐绋�',
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
clickmakesure: '鏄惁纭鐐瑰嚮锛�',
logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
@@ -879,7 +948,8 @@
formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
+ reviewproject: '棰勮浠诲姟',
+ plselectproject: '璇烽�夋嫨浠诲姟',
line: '绾胯矾',
linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
@@ -906,6 +976,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
@@ -927,5 +998,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