From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 762e03b..0197007 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -134,6 +134,7 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ hollowPriority:'涓┖浼樺厛绾�',
furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
@@ -231,6 +232,7 @@
startstatus:'鍚敤鐘舵��',
startstatusa:'鍚敤鐘舵�侊細',
instartstatus:'璇疯緭鍏ュ惎鐢ㄧ姸鎬�',
+ choicestartstatus:'璇烽�夋嫨鍚敤鐘舵��',
glassgaps:'鐜荤拑闂撮殭',
glassgapsa:'鐜荤拑闂撮殭锛�',
inglassgaps:'璇疯緭鍏ョ幓鐠冮棿闅�',
@@ -332,6 +334,8 @@
finedging:'宸茬（杈�',
},
processCard:{
+ thisIsTheIndoorSurface: '姝ら潰涓哄鍐呴潰',
+ thisSideIsOutsideTheRoom: '姝ら潰涓哄澶栭潰',
intofurnace:'杩涚倝涓�',
beforefurnace:'杩涚倝鍓�',
outfurnace:'宸插嚭鐐夌幓鐠�',
@@ -405,6 +409,7 @@
configNamea:'閰嶇疆鍚嶏細',
configCode:'閰嶇疆浠ｇ爜',
configValue:'閰嶇疆鍊�',
+ inconfigValue:'璇疯緭鍏ラ厤缃��',
configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
@@ -513,6 +518,46 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ 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: '涓┖鎬婚潰绉�',
+ hollowtotal: '涓┖鎬绘椂闂�',
+ engineerId: '宸ョ▼鍙�',
+ totalnumber: '鎬绘暟閲�',
+ tatalarea: '鎬婚潰绉�',
+
+ statistics: '鐢熶骇缁熻',
+ ExporttoExcel:'瀵煎嚭excel',
slice:'鐗�',
load:'鍒囧壊',
edg:'纾ㄨ竟',
@@ -535,6 +580,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
@@ -559,6 +605,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '鏁伴噺',
@@ -597,17 +644,17 @@
historicaltasks9:'涓┖澶х悊鐗�',
historicaltasks10:'鐢熶骇缁熻',
date:'鏃ユ湡',
- countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ countOutOne: '鍒囧壊涓�绾�',
totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
- countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ countOutTwo: '鍒囧壊浜岀嚎',
totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
- countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖',
totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
- countOut: '閽㈠寲鏁伴噺',
+ countOut: '閽㈠寲',
totalAreaOut: '閽㈠寲闈㈢Н',
- hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowCountOutOne: '涓┖涓�绾�',
hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
- hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowCountOutTwo: '涓┖浜岀嚎',
hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
@@ -754,6 +801,7 @@
finegrinding: '绮剧（',
},
hellow: {
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
clickmakesure: '鏄惁纭鐐瑰嚮锛�',
logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
@@ -877,7 +925,8 @@
formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
+ reviewproject: '棰勮浠诲姟',
+ plselectproject: '璇烽�夋嫨浠诲姟',
line: '绾胯矾',
linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
@@ -904,6 +953,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
@@ -925,5 +975,5 @@
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
- }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0