From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 9d22654..9fb23b6 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -134,6 +134,7 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
endCell:'棰勭暀灞傚彿',
@@ -176,7 +177,7 @@
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
- undesignate:'鍙栨秷鎸囧畾',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'鎬绘暟閲�',
numbercages:'绗煎瓙鍐呮暟閲�',
missingquantity:'缂哄皯鏁伴噺',
@@ -288,7 +289,7 @@
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
process:'宸ュ簭',
@@ -398,6 +399,13 @@
height:'楂樺害',
},
productStock:{
+ addconfigName:'娣诲姞閰嶇疆',
+ editconfigName:'淇敼閰嶇疆',
+ configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
usernamea:'鐢ㄦ埛鍚嶏細',
@@ -505,6 +513,56 @@
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:'纾ㄨ竟',
+ temp:'閽㈠寲',
+ hollow:'涓┖',
+ oneFinish:'涓�绾垮畬鎴�',
+ twoFinish:'浜岀嚎瀹屾垚',
+ oneunFinish:'涓�绾挎湭瀹屾垚',
+ twounFinish:'浜岀嚎鏈畬鎴�',
+ ondDamage:'涓�绾跨牬鎹�',
percent:'杩涘害鐧惧垎姣�',
time: '娆＄牬鏃堕棿',
tionnumber: '璁㈠崟鍙�',
@@ -579,17 +637,17 @@
historicaltasks9:'涓┖澶х悊鐗�',
historicaltasks10:'鐢熶骇缁熻',
date:'鏃ユ湡',
- countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ countOutOne: '鍒囧壊涓�绾�',
totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
- countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ countOutTwo: '鍒囧壊浜岀嚎',
totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
- countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖',
totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
- countOut: '閽㈠寲鏁伴噺',
+ countOut: '閽㈠寲',
totalAreaOut: '閽㈠寲闈㈢Н',
- hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowCountOutOne: '涓┖涓�绾�',
hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
- hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowCountOutTwo: '涓┖浜岀嚎',
hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
@@ -736,6 +794,8 @@
finegrinding: '绮剧（',
},
hellow: {
+ clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+ logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
pairQuantitya: '宸插嚭閰嶅鏁�',
waitingout: '绛夊緟鍑虹墖',
@@ -901,6 +961,7 @@
schedulingswitch: '璋冨害寮�鍏�',
},
screendisplay:{
+ pchoice: '璇烽�夋嫨',
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
--
Gitblit v1.8.0