From b8a043314eb644f45e3e110c75c29b19218c2ae8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 09:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index f0eb1b8..6b838e0 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -36,6 +36,7 @@
basicData: {
untask: 'No task',
tonumber: 'Total number of films uploaded',
+ sectionUpperSuccessful:'Upper section operation successful锛�',
finishnumber: 'Completed quantity',
rackreset: 'Rack reset',
prackreset: 'Is the rack reset锛�',
@@ -129,12 +130,19 @@
},
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',
@@ -404,6 +412,11 @@
height: 'Height',
},
productStock: {
+ inconfirmpassword: 'Please enter the confirmation password',
+ passwordNotMatch: 'The passwords entered do not match',
+ confirmpassword: 'Confirm Password',
+ inputNewPassword: 'Please enter a new password',
+ userIdError: 'Failed to obtain user ID',
configName: 'configure name',
configNamea:'configure name锛�',
configCode: 'Configuration Code',
@@ -516,6 +529,7 @@
createTime: 'Return date',
},
large: {
+ patchCount:'Quantity Replenished',
Productionsituation:'Production situation',
Productionandoperationstatus:'Production and operation status',
cuttingState:'Operation status on the day of cutting',
@@ -578,6 +592,7 @@
serialnumber: 'Order serial number',
inproductname: 'Please enter a product name',
productname: 'Product name',
+ engineername: 'Engineer name',
serial: 'Process validation number',
slicemarker: 'Frame marker (position)',
numberpatches: 'Number of patches',
@@ -796,6 +811,17 @@
finegrinding: 'Fine grinding',
},
hellow: {
+ pleaseConfirm: 'Please double-click to confirm this fault after the issue has been resolved to ensure the system operates normally!',
+ 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',
+ slotLess:'Insufficient remaining slots',
+ overSize:'There is glass in the straight-through feeder, end this feeding process.',
+ noGlass:'Glass information not found, please collect the project',
projectMsg2:'Please select a label template',
clickmakesure: 'Whether or not to confirm the click锛�',
logarithm: 'logarithm锛�',
--
Gitblit v1.8.0