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/en.js | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 9f7dd6b..f0eb1b8 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -135,6 +135,7 @@
takeon: 'The arrangement is complete',
},
searchOrder: {
+ hollowPriority:'Hollow priority',
furnaces:'Number of full furnaces',
furnfullTemp: 'Total amount of glass',
startCell: 'Target layer number',
@@ -334,6 +335,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',
@@ -573,6 +576,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)',
@@ -598,6 +602,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',
@@ -791,6 +796,7 @@
finegrinding: 'Fine grinding',
},
hellow: {
+ projectMsg2:'Please select a label template',
clickmakesure: 'Whether or not to confirm the click锛�',
logarithm: 'logarithm锛�',
totalPairQuantitya: 'Total number of task allocation pairs',
@@ -915,6 +921,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',
@@ -940,6 +947,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