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 | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 159 insertions(+), 16 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index b5ed364..0197007 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,6 +34,9 @@
quit:"閫�鍑�",
},
basicData:{
+ untask:'鏃犱换鍔�',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
@@ -131,6 +134,15 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ hollowPriority:'涓┖浼樺厛绾�',
+ furnaces:'婊＄倝鐐夋暟',
+ furnfullTemp:'鐜荤拑鎬婚噺',
+ startCell:'鐩爣灞傚彿',
+ endCell:'棰勭暀灞傚彿',
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
taskfailure:'浠诲姟澶辫触澶勭悊',
@@ -141,7 +153,7 @@
totalfurnaces:'鎬荤倝鏁�',
cagesnumber:'绗煎唴鏁伴噺',
slotnumber:'鍗犳湁鏍煎瓙鏁�',
- progress:'杩涘害',
+ progress:'杩涘害%',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
@@ -166,7 +178,7 @@
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
- undesignate:'鍙栨秷鎸囧畾',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'鎬绘暟閲�',
numbercages:'绗煎瓙鍐呮暟閲�',
missingquantity:'缂哄皯鏁伴噺',
@@ -220,6 +232,7 @@
startstatus:'鍚敤鐘舵��',
startstatusa:'鍚敤鐘舵�侊細',
instartstatus:'璇疯緭鍏ュ惎鐢ㄧ姸鎬�',
+ choicestartstatus:'璇烽�夋嫨鍚敤鐘舵��',
glassgaps:'鐜荤拑闂撮殭',
glassgapsa:'鐜荤拑闂撮殭锛�',
inglassgaps:'璇疯緭鍏ョ幓鐠冮棿闅�',
@@ -278,10 +291,9 @@
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
- line:'绾胯矾',
process:'宸ュ簭',
team:'鐝粍',
basic:'璁惧',
@@ -292,11 +304,13 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
glassID:'鐜荤拑ID',
height:'楂�',
width:'瀹�',
thickness:'鍘氬害',
coatingtypes:'鑶滅郴',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
productionsequence:'鍑虹墖椤哄簭',
cardnumber:'娴佺▼鍗″彿',
operate:'鎿嶄綔',
@@ -307,7 +321,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
- glasstype:'鐜荤拑绫诲瀷',
+ glasstype:'鐜荤拑鑶滅郴',
line:'绾胯矾',
status:'鐘舵��',
time:'鏃堕棿娈�',
@@ -320,6 +334,8 @@
finedging:'宸茬（杈�',
},
processCard:{
+ thisIsTheIndoorSurface: '姝ら潰涓哄鍐呴潰',
+ thisSideIsOutsideTheRoom: '姝ら潰涓哄澶栭潰',
intofurnace:'杩涚倝涓�',
beforefurnace:'杩涚倝鍓�',
outfurnace:'宸插嚭鐐夌幓鐠�',
@@ -387,6 +403,14 @@
height:'楂樺害',
},
productStock:{
+ addconfigName:'娣诲姞閰嶇疆',
+ editconfigName:'淇敼閰嶇疆',
+ configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ inconfigValue:'璇疯緭鍏ラ厤缃��',
+ configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
usernamea:'鐢ㄦ埛鍚嶏細',
@@ -494,9 +518,59 @@
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: '娆＄牬鏃堕棿',
- number: '璁㈠崟鍙�',
+ tionnumber: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
productionnumber: '鐢熶骇璁㈠崟鍙�',
cardnumber: '娴佺▼鍗″彿',
@@ -506,8 +580,9 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
- slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
+ slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
width: '瀹�',
height: '楂�',
@@ -528,7 +603,9 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '鏁伴噺',
@@ -543,13 +620,42 @@
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
loading :'姝ｅ湪涓婄墖锛�',
+ brokenNum:'鐮存崯鏁伴噺',
+ inventory:'搴撳瓨',
+ inventoryarea:'搴撳瓨闈㈢Н',
+ shippedQuantity:'宸插彂璐ф暟閲�',
+ reportWorkQuantity:'瀹屽伐鏁伴噺',
+ reportWorkQuantityCount:'鐮存崯鏁伴噺',
+ processId:'娴佺▼鍗″彿',
+ historicaltasks1:'鍘熺墖浠撳偍',
+ historicaltasks2:'涓婄墖涓�绾�',
+ historicaltasks3:'涓婄墖浜岀嚎',
+ historicaltasks4:'鍗у紡涓�绾�',
+ historicaltasks5:'鍗у紡浜岀嚎',
+ historicaltasks6:'閽㈠寲澶х悊鐗�',
+ historicaltasks7:'涓┖涓�绾�',
+ historicaltasks8:'涓┖浜岀嚎',
+ historicaltasks9:'涓┖澶х悊鐗�',
+ historicaltasks10:'鐢熶骇缁熻',
+ date:'鏃ユ湡',
+ countOutOne: '鍒囧壊涓�绾�',
+ totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
+ countOutTwo: '鍒囧壊浜岀嚎',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
+ countOut: '閽㈠寲',
+ totalAreaOut: '閽㈠寲闈㈢Н',
+ hollowCountOutOne: '涓┖涓�绾�',
+ hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
+ hollowCountOutTwo: '涓┖浜岀嚎',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
@@ -578,7 +684,6 @@
glassID :'鐜荤拑ID',
projectnumber :'宸ョ▼鍙�',
layoutID :'閽㈠寲鐗堝浘ID',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'鐘舵��',
processcards :'娴佺▼鍗�',
@@ -599,6 +704,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
@@ -616,7 +722,6 @@
delete:'鍒犻櫎',
outbound:'鍑哄簱',
deviceid:'璁惧ID',
- slot:'鏍呮牸鍙�',
enablestatea:'鍚敤鏍囪',
disable:'绂佺敤',
start:'鍚敤',
@@ -639,11 +744,12 @@
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
inquantity:'璇疯緭鍏ユ暟閲�',
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
originateslot:'璧峰鏍煎瓙',
- endslot:'鐩爣鏍煎瓙',
+ endoriginateslot:'鐩爣鏍煎瓙',
patternquantity:'鍘熺墖鏁伴噺',
enabletype:'浠诲姟绫诲瀷',
enablestate:'宸ヤ綅鐘舵��',
@@ -661,10 +767,8 @@
taskstatus :'浠诲姟鐘舵��',
built :'鏂板缓',
execution :'鎵ц涓�',
- finish :'瀹屾垚',
tasktype :'浠诲姟绫诲瀷',
stocke :'鍏ュ簱',
- outbound :'鍑哄簱',
dispatch :'璋冨害',
inquire :'鏌ヨ',
station :'宸ヤ綅',
@@ -697,8 +801,39 @@
finegrinding: '绮剧（',
},
hellow: {
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
+ clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+ logarithm: '瀵规暟锛�',
+ totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
+ pairQuantitya: '宸插嚭閰嶅鏁�',
+ waitingout: '绛夊緟鍑虹墖',
+ finishout: '鍑虹墖瀹屾垚',
+ hollowSequence: '涓┖椤哄簭',
+ isPair: '鏄惁閰嶅',
+ no: '鍚�',
+ listFormula: '閰嶆柟淇℃伅',
+ HollowGlass: '闃熷垪淇℃伅',
+ totalLayer: '鎬诲眰鏁�',
+ totalPairQuantity: '鎬婚厤瀵规暟閲�',
+ pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
+ isForceList: '鏄惁寮哄埗',
+ yesisForceList: '寮哄埗',
+ noisForceList: '闈炲己鍒�',
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
+ freethree: '涓夌嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -790,7 +925,8 @@
formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
- reviewproject: '棰勮宸ョ▼',
+ reviewproject: '棰勮浠诲姟',
+ plselectproject: '璇烽�夋嫨浠诲姟',
line: '绾胯矾',
linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
@@ -817,6 +953,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
@@ -829,8 +966,14 @@
realpieces: '瀹為檯鐗囨暟',
route: '璺嚎锛�',
croute: '璇烽�夋嫨璺嚎',
- pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
- }
+ },
+ screendisplay:{
+ pchoice: '璇烽�夋嫨',
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0