From 0961a4ebfeacaed4787c59e017691775a339616f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 10 四月 2025 14:51:28 +0800
Subject: [PATCH] 1、中空任务界面改造，新增第三条线任务判
---
UI-Project/src/lang/en.js | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index d9bbb3d..622334e 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,11 @@
quit:"Exit",
},
basicData:{
+ untask:'鏃犱换鍔�',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
printing:'鑷姩鎵撳嵃',
laserprinting:'Laser printing machine ready status锛�',
cuttingmachine:'Cutting machine ready status锛�',
@@ -94,6 +99,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
@@ -127,6 +135,27 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ furnfullTemp:'鐜荤拑鎬婚噺',
+ startCell:'鐩爣灞傚彿',
+ endCell:'棰勭暀灞傚彿',
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害%',
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partask:'浠诲姟閲嶇疆',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
@@ -263,7 +292,6 @@
specifytemperinga:'Whether to specify the tempering of this information锛�',
temperedswitch:'Tempered switch',
dutyinformation:'Duty information',
- line:'Wire',
process:'Process',
team:'Team',
basic:'equipment',
@@ -274,6 +302,8 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
glassID:'Glass ID',
height:'Height',
width:'Width',
@@ -369,6 +399,9 @@
height:'Height',
},
productStock:{
+ configName:'閰嶇疆鍚�',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
addusers:'Add user',
username:'User name',
usernamea:'User name锛�',
@@ -476,8 +509,9 @@
createTime :'Return date',
},
large:{
+ percent:'Percent',
time: 'The time of the break',
- number: 'Order number',
+ tionnumber: 'Order number',
jobnumber: 'Job number',
productionnumber: 'The production order number',
cardnumber: 'Process card number',
@@ -509,6 +543,7 @@
brokeno: 'The report is broken and not filled',
close: 'Shut down',
orderId: 'Order ID',
+ order: '璁㈠崟璇︽儏',
customerName: 'The name of the customer',
project: 'The name of the project',
are: 'are',
@@ -524,13 +559,40 @@
method: 'Processing method',
innumber: 'Quantity already entered',
productstatus: 'Production status',
- projectnumber: 'Project number',
right: 'normal',
stop: 'termination',
inquire: 'query',
starttime :'Start Time',
endtime :'End Time',
loading :'In the process of uploading锛�',
+ brokenNum:'brokenNum',
+ inventory:'inventory',
+ inventoryarea:'inventoryarea',
+ shippedQuantity:'shippedQuantity',
+ reportWorkQuantity:'reportWorkQuantity',
+ reportWorkQuantityCount:'reporting_work_num_count',
+ processId:'processId',
+ historicaltasks1:'historicaltasks1',
+ historicaltasks2:'historicaltasks2',
+ historicaltasks3:'historicaltasks3',
+ historicaltasks4:'historicaltasks4',
+ historicaltasks5:'historicaltasks5',
+ historicaltasks6:'historicaltasks6',
+ historicaltasks7:'historicaltasks7',
+ order:'order',
+ date:'date',
+ countOutOne:'countOutOne',
+ totalAreaOutOne:'totalAreaOutOne',
+ countOutTwo:'countOutTwo',
+ totalAreaOutTwo:'totalAreaOutTwo',
+ countIn:'countIn',
+ totalAreaIn:'totalAreaIn',
+ countOut:'countOut',
+ totalAreaOut:'totalAreaOut',
+ hollowCountOutOne:'hollowCountOutOne',
+ hollowTotalAreaOutOne:'hollowTotalAreaOutOne',
+ countOut:'countOut',
+ hollowCountOutTwo:'hollowCountOutTwo',
},
reportmanage:{
productiontime :'production time',
@@ -546,6 +608,7 @@
dreportwork :'Unreported work',
pendingwork :'Pending job application',
reportwork :'Reported work',
+ reportworked :'Reported worked',
incise :'slicing',
edging :'edging',
steel :'toughened',
@@ -558,7 +621,6 @@
glassID :'Glass ID',
projectnumber :'Project number',
layoutID :'Tempered layout ID',
- productiontime :'鐢熶骇鏃堕棿',
type :'type',
state :'state',
processcards :'Flow Card',
@@ -579,6 +641,8 @@
premark :'Please enter a note',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
+ fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -595,7 +659,6 @@
delete:'Delete',
outbound:'Outbound',
deviceid:'device ID',
- slot:'Grid number',
enablestatea:'Enable tagging',
disable:'Disable',
start:'Enable',
@@ -617,12 +680,13 @@
filmsa:'Films锛�',
createtime:'Creation time',
remainquantity:'Remaining Quantity',
+ thickremainquant:'Remaining quantity of original film (sheets)',
thickremainquantity:'Remaining quantity of original film (sheets)锛�',
inquantity:'Please enter the quantity',
quantitya:'Number锛�',
enableid:'Task ID',
originateslot:'Starting grid',
- endslot:'鐩爣鏍煎瓙',
+ endoriginateslot:'鐩爣鏍煎瓙',
patternquantity:'Number',
enabletype:'Task Type',
enablestate:'Workstation status',
@@ -640,10 +704,8 @@
taskstatus :'Status',
built :'newly built',
execution :'In progress',
- finish :'瀹屾垚',
tasktype :'Task Type',
stocke :'store',
- outbound :'鍑哄簱',
dispatch :'dispatch',
inquire :'query',
station :'station',
@@ -676,8 +738,36 @@
finegrinding: '绮剧（',
},
hellow: {
+ 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',
@@ -808,8 +898,13 @@
realpieces: '瀹為檯鐗囨暟',
route: '璺嚎锛�',
croute: '璇烽�夋嫨璺嚎',
- pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
- }
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0