From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index f489c3a..20dfcf7 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -129,12 +129,20 @@
},
order: {
projectnumber: 'Please enter the project number',
+ noGlassToDamage:'No broken glass锛�',
dilapidation: 'Breakage',
+ dilapidationDetails:'Damage details',
+ dilapidationAll:'One-click damage',
+ dilapidationWhether:'Whether it is broken with one click锛�',
takeaway: 'Manual removal',
takeawaya: 'Should the information be manually taken away锛�',
takeon: 'The arrangement is complete',
},
searchOrder: {
+ loadingText: 'Loading data, please wait...',
+ firstLinePriority: 'First-line priority',
+ secondLinePriority: 'second-line priority',
+ hollowPriority:'Hollow priority',
furnaces:'Number of full furnaces',
furnfullTemp: 'Total amount of glass',
startCell: 'Target layer number',
@@ -232,6 +240,7 @@
startstatus: 'Start status',
startstatusa: 'Start status锛�',
instartstatus: 'Please enter the enabled status',
+ choicestartstatus:'Please select Enable status',
glassgaps: 'Glass gap',
glassgapsa: 'Glass gap锛�',
inglassgaps: 'Please enter the glass gap',
@@ -333,6 +342,8 @@
finedging: 'has been edging',
},
processCard: {
+ thisIsTheIndoorSurface: 'This is the indoor surface',
+ thisSideIsOutsideTheRoom: 'This side is outside the room',
intofurnace: 'Entering the furnace',
beforefurnace: 'Before entering the furnace',
outfurnace: 'Glass finished from tempering furnace',
@@ -403,6 +414,7 @@
configName: 'configure name',
configNamea:'configure name锛�',
configCode: 'Configuration Code',
+ inconfigValue:'Please enter the configured values',
configValue: 'Configuration value',
addusers: 'Add user',
username: 'User name',
@@ -511,6 +523,7 @@
createTime: 'Return date',
},
large: {
+ patchCount:'Quantity Replenished',
Productionsituation:'Production situation',
Productionandoperationstatus:'Production and operation status',
cuttingState:'Operation status on the day of cutting',
@@ -571,6 +584,7 @@
detailID: 'Detail ID',
building: 'Building No',
serialnumber: 'Order serial number',
+ inproductname: 'Please enter a product name',
productname: 'Product name',
serial: 'Process validation number',
slicemarker: 'Frame marker (position)',
@@ -596,6 +610,7 @@
orderId: 'Order ID',
order: 'Order details',
customerName: 'The name of the customer',
+ incustomerName: 'Please enter the name of the customer',
project: 'The name of the project',
are: 'are',
quantity: 'quantity',
@@ -789,6 +804,14 @@
finegrinding: 'Fine grinding',
},
hellow: {
+ taskAlreadyClaimed: 'This task has already been claimed and cannot be performed again.',
+ claimed: 'Already claimed',
+ claimFailed: 'Failed to receive task',
+ claimedTasksCleared: 'The received task status has been cleared',
+ Content:'Content',
+ idSame:'The glass ID for the entry task is the same',
+ sizeSame:'There are glass pieces of the same specification inside the cage',
+ projectMsg2:'Please select a label template',
clickmakesure: 'Whether or not to confirm the click锛�',
logarithm: 'logarithm锛�',
totalPairQuantitya: 'Total number of task allocation pairs',
@@ -913,6 +936,7 @@
stopproject: 'Pause Task',
pstopproject: 'Do you want to pause the task锛�',
reviewproject: 'Preview project',
+ plselectproject: 'Select Preview Project',
line: 'line',
linea: 'line锛�',
line1: 'Line 1',
@@ -938,6 +962,7 @@
cardnumbera: 'Process card number锛�',
layernumber: 'Layer number',
totalnumber: 'Total number of films',
+ pairsnumbertotal: 'The total number of pairs锛�',
pairsnumber: 'Matched quantity',
missingnumber: 'Number of missing pieces',
damagenumber: 'A quantity broken.',
--
Gitblit v1.8.0