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 | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index f0eb1b8..20dfcf7 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -129,12 +129,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',
@@ -516,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',
@@ -796,6 +804,13 @@
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锛�',
--
Gitblit v1.8.0