From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 207 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 195 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index e413ff6..5cceb30 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,6 +34,12 @@
quit:"閫�鍑�",
},
basicData:{
+ untask:'鏃犱换鍔�',
+ up:'涓婄墖',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
cuttingmachine:'鍒囧壊鏈哄氨缁姸鎬侊細',
machine:'涓婄墖鏈鸿仈鏈虹姸鎬侊細',
@@ -86,6 +92,25 @@
layoutSequence:'搴忓彿',
},
sorter:{
+ onesort:'涓�绾挎幇鐗�',
+ twosort:'浜岀嚎鎺扮墖',
+ inPlace:'鍒颁綅',
+ ninPlace:'鏈埌浣�',
+ emptymissions:'绌轰换鍔�',
+ advancetask:'杩涚墖浠诲姟',
+ outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
+ straighttasks:'鐩撮�氫换鍔�',
+ endingtask:'缁撴潫',
+ another:'鍏朵粬',
+ id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+ remainWidth:'鍓╀綑',
+ taskRunning:'浠诲姟璇锋眰',
+ updateTime:'鏇存柊鏃堕棿',
+ place:'鏄惁鍒颁綅',
+ layernow:'褰撳墠灞傚彿',
gridnumber:'鏍呮牸鍙�',
glassnumber:'鐜荤拑缂栧彿',
width:'瀹�',
@@ -103,13 +128,49 @@
cancel:'鍙栨秷',
},
order:{
+ projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
dilapidation:'鐮存崯',
takeaway:'浜哄伐鎷胯蛋',
+ takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
- deleteTask:'鍒犻櫎宸ョ▼',
- pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害%',
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
+ partask:'浠诲姟閲嶇疆',
+ partasks:'鏄惁浠诲姟閲嶇疆锛�',
+ empty:'榛樿绌轰换鍔�',
+ historicaltasks:'鍘嗗彶浠诲姟',
+ cagedetails:'绗煎唴璇︽儏',
+ inkageEntity:'杩涚墖鑱旀満鐘舵�侊細',
+ requestEntity:'杩涚墖璇锋眰鐘舵�侊細',
+ mesReplyEntity:'鍚姩鍛戒护锛�',
+ outInkageEntity:'鍑虹墖鑱旀満鐘舵�侊細',
+ outRequestEntity:'鍑虹墖璇锋眰鐘舵�侊細',
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
+ processcard:'鎸囧畾娴佺▼鍗�',
+ filminformation:'浜哄伐涓嬬墖淇℃伅',
+ currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
+ printlabels:'鎵撳嵃鏍囩',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
@@ -233,18 +294,19 @@
team:'鐝粍',
basic:'璁惧',
makesure:'纭淇濆瓨',
- cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
Labelprinting:'鏍囩鎵撳嵃',
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
glassID:'鐜荤拑ID',
height:'楂�',
width:'瀹�',
thickness:'鍘氬害',
coatingtypes:'鑶滅郴',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
productionsequence:'鍑虹墖椤哄簭',
cardnumber:'娴佺▼鍗″彿',
operate:'鎿嶄綔',
@@ -255,7 +317,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
- glasstype:'鐜荤拑绫诲瀷',
+ glasstype:'鐜荤拑鑶滅郴',
line:'绾胯矾',
status:'鐘舵��',
time:'鏃堕棿娈�',
@@ -334,7 +396,6 @@
width:'瀹藉害',
height:'楂樺害',
},
-
productStock:{
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
@@ -405,14 +466,11 @@
},
replenish:{
patchManagement:'琛ョ墖绠＄悊',
-
},
rework:{
reworkManagement:'杩斿伐绠＄悊',
addRework:"杩斿伐鏂板 ",
},
-
-
role:{
id:'ID',
characterHomepage:'瑙掕壊棣栭〉',
@@ -446,6 +504,7 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ percent:'杩涘害鐧惧垎姣�',
time: '娆＄牬鏃堕棿',
number: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
@@ -506,16 +565,17 @@
productiontime :'鐢熶骇鏃堕棿',
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
- ctype :'娓呴�夋嫨绫诲瀷',
- cstate :'娓呴�夋嫨鐘舵��',
- cprocess :'娓呴�夋嫨宸ュ簭',
+ ctype :'璇烽�夋嫨绫诲瀷',
+ cstate :'璇烽�夋嫨鐘舵��',
+ cprocess :'璇烽�夋嫨宸ュ簭',
all :'鍏ㄩ儴',
completed :'瀹屽伐',
broke :'鐮存崯',
takeout :'鎷胯蛋',
dreportwork :'鏈姤宸�',
- pendingwork :'寰呮姤宸�',
+ pendingwork :'宸茬幇琛�',
reportwork :'宸叉姤宸�',
+ reportworked :'宸插悓姝�',
incise :'鍒囧壊',
edging :'纾ㄨ竟',
steel :'閽㈠寲',
@@ -549,6 +609,8 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
+ fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -588,6 +650,7 @@
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
inquantity:'璇疯緭鍏ユ暟閲�',
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
@@ -641,10 +704,122 @@
removalmethodp: '闄よ啘鏂瑰紡',
removalmethoda: '闄よ啘鏂瑰紡锛�',
noremoval: '涓嶉櫎鑶�',
+ removal: '闄よ啘',
coarselyground: '绮楃（',
finegrinding: '绮剧（',
},
hellow: {
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
+ freeone: '涓�绾跨┖闂茬姸鎬侊細',
+ freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
+ casFour: '姘斾綋4',
+ casFourb: '姘斾綋4锛�',
+ casFoura: '璇烽�夋嫨姘斾綋4',
+ casOne: '姘斾綋1',
+ casOneb: '姘斾綋1锛�',
+ casOnea: '璇烽�夋嫨姘斾綋1',
+ casThree: '姘斾綋3',
+ casThreeb: '姘斾綋3锛�',
+ casThreea: '璇烽�夋嫨姘斾綋3',
+ casTwo: '姘斾綋2',
+ casTwob: '姘斾綋2锛�',
+ casTwoa: '璇烽�夋嫨姘斾綋2',
+ Y: '鏈�',
+ F: '鏃�',
+ frameFour: '闂撮殧鏉�4',
+ frameFourb: '闂撮殧鏉�4锛�',
+ frameFoura: '璇疯緭鍏ラ棿闅旀澘4',
+ frameOne: '闂撮殧鏉�1',
+ frameOneb: '闂撮殧鏉�1锛�',
+ frameOnea: '璇疯緭鍏ラ棿闅旀澘1',
+ frameThree: '闂撮殧鏉�3',
+ frameThreeb: '闂撮殧鏉�3锛�',
+ frameThreea: '璇疯緭鍏ラ棿闅旀澘3',
+ frameTwo: '闂撮殧鏉�2',
+ frameTwob: '闂撮殧鏉�2锛�',
+ frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
+ intervalFrameHeightOne: '闂撮殧妗嗛珮搴�1',
+ intervalFrameHeightTwo: '闂撮殧妗嗛珮搴�2',
+ intervalFrameHeightThree: '闂撮殧妗嗛珮搴�3',
+ intervalFrameHeightFour: '闂撮殧妗嗛珮搴�4',
+ intervalFrameHeightaOne: '璇疯緭鍏ラ棿闅旀楂樺害1',
+ intervalFrameHeightaTwo: '璇疯緭鍏ラ棿闅旀楂樺害2',
+ intervalFrameHeightaThree: '璇疯緭鍏ラ棿闅旀楂樺害3',
+ intervalFrameHeightaFour: '璇疯緭鍏ラ棿闅旀楂樺害4',
+ intervalFrameHeightbOne: '闂撮殧妗嗛珮搴�1锛�',
+ intervalFrameHeightbTwo: '闂撮殧妗嗛珮搴�2锛�',
+ intervalFrameHeightbThree: '闂撮殧妗嗛珮搴�3锛�',
+ intervalFrameHeightbFour: '闂撮殧妗嗛珮搴�4锛�',
+ intervalFrameTypeOne: '闂撮殧妗嗙被鍨�1',
+ intervalFrameTypeTwo: '闂撮殧妗嗙被鍨�2',
+ intervalFrameTypeThree: '闂撮殧妗嗙被鍨�3',
+ intervalFrameTypeFour: '闂撮殧妗嗙被鍨�4',
+ intervalFrameTypecOne: '璇烽�夋嫨闂撮殧妗嗙被鍨�1',
+ intervalFrameTypecTwo: '璇烽�夋嫨闂撮殧妗嗙被鍨�2',
+ intervalFrameTypecThree: '璇烽�夋嫨闂撮殧妗嗙被鍨�3',
+ intervalFrameTypecFour: '璇烽�夋嫨闂撮殧妗嗙被鍨�4',
+ intervalFrameTypedOne: '闂撮殧妗嗙被鍨�1锛�',
+ intervalFrameTypedTwo: '闂撮殧妗嗙被鍨�2锛�',
+ intervalFrameTypedThree: '闂撮殧妗嗙被鍨�3锛�',
+ intervalFrameTypedFour: '闂撮殧妗嗙被鍨�4锛�',
+ intervalFrameTypea: 'tps鑳�',
+ intervalFrameTypeb: '閾濋棿闅旀潯',
+ intervalFrameWidthOne: '闂撮殧妗嗗搴�1',
+ intervalFrameWidthTwo: '闂撮殧妗嗗搴�2',
+ intervalFrameWidthThree: '闂撮殧妗嗗搴�3',
+ intervalFrameWidthFour: '闂撮殧妗嗗搴�4',
+ intervalFrameWidthaOne: '璇疯緭鍏ラ棿闅旀瀹藉害1',
+ intervalFrameWidthaTwo: '璇疯緭鍏ラ棿闅旀瀹藉害2',
+ intervalFrameWidthaThree: '璇疯緭鍏ラ棿闅旀瀹藉害3',
+ intervalFrameWidthaFour: '璇疯緭鍏ラ棿闅旀瀹藉害4',
+ intervalFrameWidthbOne: '闂撮殧妗嗗搴�1锛�',
+ intervalFrameWidthbTwo: '闂撮殧妗嗗搴�2锛�',
+ intervalFrameWidthbThree: '闂撮殧妗嗗搴�3锛�',
+ intervalFrameWidthbFour: '闂撮殧妗嗗搴�4锛�',
+ sealInsert: '瀵嗗皝宓屽叆',
+ sealInsertb: '瀵嗗皝宓屽叆锛�',
+ sealInserta: '璇疯緭鍏ュ瘑灏佸祵鍏�',
+ hollowformula: '涓┖閰嶆柟',
+ hollowformuldet: '鏄惁鍒犻櫎璇ヤ腑绌洪厤鏂癸紵',
+ hollowtaskdet: '鏄惁鍒犻櫎璇ヤ换鍔★紵',
+ taskdet: '鍒犻櫎浠诲姟',
+ edithollowformula: '淇敼涓┖閰嶆柟',
+ phollowformula: '璇烽�夋嫨涓┖閰嶆柟',
+ hollowformulp: '涓┖閰嶆柟锛�',
+ bottomRemove: '涓嬩晶闄よ啘閲忥細',
+ bottomRemovep: '涓嬩晶闄よ啘閲�',
+ bottomRemovea: '璇疯緭鍏ヤ笅渚ч櫎鑶滈噺',
+ topRemove: '涓婁晶闄よ啘閲忥細',
+ topRemovep: '涓婁晶闄よ啘閲�',
+ topRemovea: '璇疯緭鍏ヤ笂渚ч櫎鑶滈噺',
+ leftRemove: '宸︿晶闄よ啘閲忥細',
+ leftRemovep: '宸︿晶闄よ啘閲�',
+ leftRemovea: '璇疯緭鍏ュ乏渚ч櫎鑶滈噺',
+ rightRemove: '鍙充晶闄よ啘閲忥細',
+ rightRemovep: '鍙充晶闄よ啘閲�',
+ rightRemovea: '璇疯緭鍏ュ彸渚ч櫎鑶滈噺',
+ formulaNamep: '閰嶆柟鍚�',
+ formulaName: '閰嶆柟鍚嶏細',
+ formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
+ stopproject: '鏆傚仠浠诲姟',
+ pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
+ reviewproject: '棰勮宸ョ▼',
+ line: '绾胯矾',
+ linea: '绾胯矾锛�',
+ line1: '绾胯矾涓�',
+ line2: '绾胯矾浜�',
+ line3: '绾胯矾涓�',
createtask: '鍒涘缓浠诲姟',
starttask: '寮�濮嬩换鍔�',
pstarttask: '鏄惁寮�濮嬩换鍔★紵',
@@ -654,8 +829,10 @@
claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
linenumber: '杩涘叆涓┖绾挎暟閲忥細',
order: '鍑虹墖椤哄簭',
+ flowCardId: '娴佺▼鍗�',
thickness: '鍘氬害',
coatingtypes: '鑶滅郴',
+ layer: '灞傛暟',
height: '闀�',
width: '瀹�',
state: '鐘舵��',
@@ -665,6 +842,7 @@
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
missingnumber: '缂虹墖鏁伴噺',
+ damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
claimquest: '棰嗗彇浠诲姟',
pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
@@ -678,5 +856,10 @@
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0