From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 205 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 0e3c60f..4287482 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,9 @@
quit:"Exit",
},
basicData:{
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
+ printing:'鑷姩鎵撳嵃',
laserprinting:'Laser printing machine ready status锛�',
cuttingmachine:'Cutting machine ready status锛�',
machine:'Online status of the loading table锛�',
@@ -86,6 +89,22 @@
layoutSequence:'Serial Number',
},
sorter:{
+ onesort:'涓�绾挎幇鐗�',
+ twosort:'浜岀嚎鎺扮墖',
+ inPlace:'鍒颁綅',
+ ninPlace:'鏈埌浣�',
+ emptymissions:'绌轰换鍔�',
+ advancetask:'杩涚墖浠诲姟',
+ outputtasks:'鍑虹墖浠诲姟',
+ straighttasks:'鐩撮�氫换鍔�',
+ endingtask:'缁撴潫',
+ another:'鍏朵粬',
+ taskRunning:'浠诲姟璇锋眰',
+ updateTime:'鏇存柊鏃堕棿',
+ id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+ remainWidth:'鍓╀綑',
+ place:'鏄惁鍒颁綅',
+ layernow:'褰撳墠灞傚彿',
gridnumber:'Grid number',
glassnumber:'Glass number',
width:'Width',
@@ -103,11 +122,31 @@
cancel:'Cancel',
},
order:{
+ projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
dilapidation:'Breakage',
takeaway:'Manual removal',
+ takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'The arrangement is complete',
},
searchOrder:{
+ partask:'浠诲姟閲嶇疆',
+ partasks:'鏄惁浠诲姟閲嶇疆锛�',
+ empty:'榛樿绌轰换鍔�',
+ historicaltasks:'鍘嗗彶浠诲姟',
+ cagedetails:'绗煎唴璇︽儏',
+ inkageEntity:'杩涚墖鑱旀満鐘舵�侊細',
+ requestEntity:'杩涚墖璇锋眰鐘舵�侊細',
+ mesReplyEntity:'鍚姩鍛戒护锛�',
+ outInkageEntity:'鍑虹墖鑱旀満鐘舵�侊細',
+ outRequestEntity:'鍑虹墖璇锋眰鐘舵�侊細',
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
+ processcard:'鎸囧畾娴佺▼鍗�',
+ filminformation:'浜哄伐涓嬬墖淇℃伅',
+ currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
+ printlabels:'鎵撳嵃鏍囩',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'Non-tempered process card inquiry',
fullfurnaces:'Number of full furnaces',
specifiedproject:'The currently specified project',
@@ -218,6 +257,7 @@
tit:'data',
temperingqueries:'Tempering queries',
specifytempering:'Specify a furnace',
+ specifyout:'鎸囧畾浜哄伐鍑虹墖',
specifyengineerid:'Specify the project',
projectnumber:'Project number',
layoutnumber:'Drawing number of loading for tempering furnace',
@@ -225,13 +265,15 @@
specifytemperinga:'Whether to specify the tempering of this information锛�',
temperedswitch:'Tempered switch',
dutyinformation:'Duty information',
+ line:'Wire',
process:'Process',
team:'Team',
basic:'equipment',
makesure:'Confirm the save',
- // cancel:'鍙栨秷',
temperingtotal:'Number of tempering furnaces锛�',
glasstotal:'Total number of glasses锛�',
+ Labelprinting:'鏍囩鎵撳嵃',
+ Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
glassID:'Glass ID',
@@ -328,7 +370,6 @@
width:'Width',
height:'Height',
},
-
productStock:{
addusers:'Add user',
username:'User name',
@@ -399,14 +440,11 @@
},
replenish:{
patchManagement:'Mesh management',
-
},
rework:{
reworkManagement:'Rework management',
addRework:"Rework added ",
},
-
-
role:{
id:'ID',
characterHomepage:'Character Home',
@@ -484,9 +522,11 @@
allstatus: 'All in stock status',
completedquantity: 'Completed quantity',
scrapquantity: 'Scrap Quantity',
+ number: 'Quantity',
method: 'Processing method',
innumber: 'Quantity already entered',
productstatus: 'Production status',
+ projectnumber: 'Project number',
right: 'normal',
stop: 'termination',
inquire: 'query',
@@ -520,6 +560,7 @@
glassID :'Glass ID',
projectnumber :'Project number',
layoutID :'Tempered layout ID',
+ productiontime :'鐢熶骇鏃堕棿',
type :'type',
state :'state',
processcards :'Flow Card',
@@ -540,8 +581,18 @@
premark :'Please enter a note',
},
film:{
+ fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
+ pwarehousing:'鍏ュ簱璇锋眰',
+ wareout:'鍘熺墖鍑哄簱',
+ information:'鏄惁鍑哄簱璇ユ潯淇℃伅锛�',
+ pwareout:'鍑哄簱璇锋眰',
+ position:'鍚婅浣嶏細',
+ cposition:'璇烽�夋嫨鍚婅浣�',
+ position1:'鍚婅浣�1',
+ position2:'鍚婅浣�2',
+ addglass:'鍘熺墖淇℃伅',
operate: 'Operate',
exit:'Edit',
delete:'Delete',
@@ -554,6 +605,7 @@
startslot:'Start workstation',
endslot:'Target workstation',
slotid:'Grid ID',
+ slot:'鏍煎瓙鍙�',
width:'Width',
widtha:'Width锛�',
inwidth:'Please enter width',
@@ -573,6 +625,7 @@
quantitya:'Number锛�',
enableid:'Task ID',
originateslot:'Starting grid',
+ endslot:'鐩爣鏍煎瓙',
patternquantity:'Number',
enabletype:'Task Type',
enablestate:'Workstation status',
@@ -590,8 +643,10 @@
taskstatus :'Status',
built :'newly built',
execution :'In progress',
+ finish :'瀹屾垚',
tasktype :'Task Type',
stocke :'store',
+ outbound :'鍑哄簱',
dispatch :'dispatch',
inquire :'query',
station :'station',
@@ -604,6 +659,7 @@
oneloadingline :'Line 1 on film',
twoloadingline :'Line 2 on film',
waiting :'Waiting',
+ pass: 'Pass',
setparameters :'Set parameters',
project :'Project number',
projecta :'Project number锛�',
@@ -614,6 +670,149 @@
state :'state',
createtime :'Creation time',
all :'Select All',
-
+ removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
+ removalmethodp: '闄よ啘鏂瑰紡',
+ removalmethoda: '闄よ啘鏂瑰紡锛�',
+ noremoval: '涓嶉櫎鑶�',
+ removal: '闄よ啘',
+ coarselyground: '绮楃（',
+ finegrinding: '绮剧（',
+ },
+ hellow: {
+ 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: '鏄惁寮�濮嬩换鍔★紵',
+ stoptask: '鍋滄浠诲姟',
+ pstoptask: '鏄惁鍋滄浠诲姟锛�',
+ currenttask: '褰撳墠浠诲姟锛�',
+ claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
+ linenumber: '杩涘叆涓┖绾挎暟閲忥細',
+ order: '鍑虹墖椤哄簭',
+ flowCardId: '娴佺▼鍗�',
+ thickness: '鍘氬害',
+ coatingtypes: '鑶滅郴',
+ layer: '灞傛暟',
+ height: '闀�',
+ width: '瀹�',
+ state: '鐘舵��',
+ cardnumber: '娴佺▼鍗″彿',
+ cardnumbera: '娴佺▼鍗″彿锛�',
+ layernumber: '灞傚彿',
+ totalnumber: '鎬荤墖鏁�',
+ pairsnumber: '宸查厤瀵规暟閲�',
+ missingnumber: '缂虹墖鏁伴噺',
+ damagenumber: '鐮存崯鏁伴噺',
+ operate: '鎿嶄綔',
+ claimquest: '棰嗗彇浠诲姟',
+ pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
+ missingfilms: '缂虹墖璇︽儏',
+ forcedfilming: '寮哄埗鍑虹墖',
+ pforcedfilming: '鏄惁寮哄埗鍑虹墖锛�',
+ brokenpieces: '鐮存崯鐗囨暟',
+ realpieces: '瀹為檯鐗囨暟',
+ route: '璺嚎锛�',
+ croute: '璇烽�夋嫨璺嚎',
+ pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
+ schedulingswitch: '璋冨害寮�鍏�',
}
}
\ No newline at end of file
--
Gitblit v1.8.0