From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
UI-Project/src/lang/en.js | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 6b838e0..b087219 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -36,7 +36,7 @@
basicData: {
untask: 'No task',
tonumber: 'Total number of films uploaded',
- sectionUpperSuccessful:'Upper section operation successful锛�',
+ sectionUpperSuccessful: 'Upper section operation successful锛�',
finishnumber: 'Completed quantity',
rackreset: 'Rack reset',
prackreset: 'Is the rack reset锛�',
@@ -130,11 +130,11 @@
},
order: {
projectnumber: 'Please enter the project number',
- noGlassToDamage:'No broken glass锛�',
+ noGlassToDamage: 'No broken glass锛�',
dilapidation: 'Breakage',
- dilapidationDetails:'Damage details',
- dilapidationAll:'One-click damage',
- dilapidationWhether:'Whether it is broken with one click锛�',
+ 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',
@@ -143,8 +143,8 @@
loadingText: 'Loading data, please wait...',
firstLinePriority: 'First-line priority',
secondLinePriority: 'second-line priority',
- hollowPriority:'Hollow priority',
- furnaces:'Number of full furnaces',
+ hollowPriority: 'Hollow priority',
+ furnaces: 'Number of full furnaces',
furnfullTemp: 'Total amount of glass',
startCell: 'Target layer number',
endCell: 'Reserved layer number',
@@ -241,7 +241,7 @@
startstatus: 'Start status',
startstatusa: 'Start status锛�',
instartstatus: 'Please enter the enabled status',
- choicestartstatus:'Please select Enable status',
+ choicestartstatus: 'Please select Enable status',
glassgaps: 'Glass gap',
glassgapsa: 'Glass gap锛�',
inglassgaps: 'Please enter the glass gap',
@@ -366,6 +366,14 @@
glasstakeout: 'Glass take away list',
layoutID: 'Drawing ID of loading for tempering furnace',
glassID: 'Glass ID',
+ tempState1: 'Task Generated', // -1 鐢熸垚浠诲姟
+ tempState2: 'Sheet Output Completed', // 0 鍑虹墖瀹屾垚
+ tempState3: 'Sheet Arrangement Completed', // 1 鎽嗙墖瀹屾垚
+ tempState4: 'Furnace Entry Completed', // 2 杩涚倝瀹屾垚
+ tempState5: 'Tempering Completed', // 3 閽㈠寲瀹屾垚
+ tempState6: 'Sheet Output Completed', // 4 鍑虹墖瀹屾垚
+ tempState7: 'Damaged', // 8 鐮存崯
+ tempState8: 'Taken Away', // 9 鎷胯蛋
},
reportWork: {
details: 'Drop off details',
@@ -418,9 +426,9 @@
inputNewPassword: 'Please enter a new password',
userIdError: 'Failed to obtain user ID',
configName: 'configure name',
- configNamea:'configure name锛�',
+ configNamea: 'configure name锛�',
configCode: 'Configuration Code',
- inconfigValue:'Please enter the configured values',
+ inconfigValue: 'Please enter the configured values',
configValue: 'Configuration value',
addusers: 'Add user',
username: 'User name',
@@ -529,19 +537,19 @@
createTime: 'Return date',
},
large: {
- patchCount:'Quantity Replenished',
- Productionsituation:'Production situation',
- Productionandoperationstatus:'Production and operation status',
- cuttingState:'Operation status on the day of cutting',
- edgingState:'Operation status on the day of edge grinding',
- temperingState:'Operation status of tempered steel on the day of tempering',
- hollowState:'Production and operation status of hollow on the same day',
+ patchCount: 'Quantity Replenished',
+ Productionsituation: 'Production situation',
+ Productionandoperationstatus: 'Production and operation status',
+ cuttingState: 'Operation status on the day of cutting',
+ edgingState: 'Operation status on the day of edge grinding',
+ temperingState: 'Operation status of tempered steel on the day of tempering',
+ hollowState: 'Production and operation status of hollow on the same day',
switch: 'Switch',
running: 'Running',
- stopping:'Stopping',
- diffMinutes:'diffMinutes',
- loadstart:'Load start',
- loadend:'Load end',
+ stopping: 'Stopping',
+ diffMinutes: 'diffMinutes',
+ loadstart: 'Load start',
+ loadend: 'Load end',
loadtotal: 'Load total',
loadfree: 'Load free',
loaddiff: 'Load diff',
@@ -552,7 +560,7 @@
temptotal: 'Temp total',
tempfree: 'Temp free',
tempdiff: 'Temp diff',
- tempstove: 'temp stove',
+ tempstove: 'temp stove',
tempnumber: 'Temp number',
temparea: 'Temp area',
hollowstart: 'Hollow start',
@@ -568,8 +576,8 @@
totalnumber: 'Total number',
tatalarea: 'Total area',
statistics: 'Statistics',
- ExporttoExcel:'Export to Excel',
- slice:'slice',
+ ExporttoExcel: 'Export to Excel',
+ slice: 'slice',
load: 'load',
edg: 'edg',
temp: 'temp',
@@ -816,13 +824,13 @@
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',
+ 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锛�',
totalPairQuantitya: 'Total number of task allocation pairs',
--
Gitblit v1.8.0