From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮：清除笼内状态为0的玻璃数据，并将格子尺寸恢复到初始状态。 2、历史任务按钮：按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时，仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱，当数量小于总层数时，增加是否同一对玻璃的判断，避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息
---
UI-Project/src/lang/en.js | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 33e3bc0..0f88a55 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,8 @@
quit:"Exit",
},
basicData:{
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
printing:'鑷姩鎵撳嵃',
laserprinting:'Laser printing machine ready status锛�',
cuttingmachine:'Cutting machine ready status锛�',
@@ -94,6 +96,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
@@ -127,6 +132,20 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害',
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partask:'浠诲姟閲嶇疆',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
@@ -476,6 +495,7 @@
createTime :'Return date',
},
large:{
+ percent:'Percent',
time: 'The time of the break',
number: 'Order number',
jobnumber: 'Job number',
@@ -546,6 +566,7 @@
dreportwork :'Unreported work',
pendingwork :'Pending job application',
reportwork :'Reported work',
+ reportworked :'Reported worked',
incise :'slicing',
edging :'edging',
steel :'toughened',
@@ -579,6 +600,7 @@
premark :'Please enter a note',
},
film:{
+ fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -676,6 +698,8 @@
finegrinding: '绮剧（',
},
hellow: {
+ freeone: '涓�绾跨┖闂茬姸鎬侊細',
+ freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -702,17 +726,44 @@
frameTwo: '闂撮殧鏉�2',
frameTwob: '闂撮殧鏉�2锛�',
frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
- intervalFrameHeight: '闂撮殧妗嗛珮搴�',
- intervalFrameHeighta: '璇疯緭鍏ラ棿闅旀楂樺害',
- intervalFrameHeightb: '闂撮殧妗嗛珮搴︼細',
- intervalFrameType: '闂撮殧妗嗙被鍨�',
- intervalFrameTypec: '璇烽�夋嫨闂撮殧妗嗙被鍨�',
- intervalFrameTyped: '闂撮殧妗嗙被鍨嬶細',
+ intervalFrameHeightOne: '闂撮殧妗嗛珮搴�1',
+ intervalFrameHeightTwo: '闂撮殧妗嗛珮搴�2',
+ intervalFrameHeightThree: '闂撮殧妗嗛珮搴�3',
+ intervalFrameHeightFour: '闂撮殧妗嗛珮搴�4',
+ intervalFrameHeightaOne: '璇疯緭鍏ラ棿闅旀楂樺害1',
+ intervalFrameHeightaTwo: '璇疯緭鍏ラ棿闅旀楂樺害2',
+ intervalFrameHeightaThree: '璇疯緭鍏ラ棿闅旀楂樺害3',
+ intervalFrameHeightaFour: '璇疯緭鍏ラ棿闅旀楂樺害4',
+ intervalFrameHeightbOne: '闂撮殧妗嗛珮搴�1锛�',
+ intervalFrameHeightbTwo: '闂撮殧妗嗛珮搴�2锛�',
+ intervalFrameHeightbThree: '闂撮殧妗嗛珮搴�3锛�',
+ intervalFrameHeightbFour: '闂撮殧妗嗛珮搴�4锛�',
+ intervalFrameTypeOne: '闂撮殧妗嗙被鍨�1',
+ intervalFrameTypeTwo: '闂撮殧妗嗙被鍨�2',
+ intervalFrameTypeThree: '闂撮殧妗嗙被鍨�3',
+ intervalFrameTypeFour: '闂撮殧妗嗙被鍨�4',
+ intervalFrameTypecOne: '璇烽�夋嫨闂撮殧妗嗙被鍨�1',
+ intervalFrameTypecTwo: '璇烽�夋嫨闂撮殧妗嗙被鍨�2',
+ intervalFrameTypecThree: '璇烽�夋嫨闂撮殧妗嗙被鍨�3',
+ intervalFrameTypecFour: '璇烽�夋嫨闂撮殧妗嗙被鍨�4',
+ intervalFrameTypedOne: '闂撮殧妗嗙被鍨�1锛�',
+ intervalFrameTypedTwo: '闂撮殧妗嗙被鍨�2锛�',
+ intervalFrameTypedThree: '闂撮殧妗嗙被鍨�3锛�',
+ intervalFrameTypedFour: '闂撮殧妗嗙被鍨�4锛�',
intervalFrameTypea: 'tps鑳�',
intervalFrameTypeb: '閾濋棿闅旀潯',
- intervalFrameWidth: '闂撮殧妗嗗搴�',
- intervalFrameWidtha: '璇疯緭鍏ラ棿闅旀瀹藉害',
- intervalFrameWidthb: '闂撮殧妗嗗搴︼細',
+ intervalFrameWidthOne: '闂撮殧妗嗗搴�1',
+ intervalFrameWidthTwo: '闂撮殧妗嗗搴�2',
+ intervalFrameWidthThree: '闂撮殧妗嗗搴�3',
+ intervalFrameWidthFour: '闂撮殧妗嗗搴�4',
+ intervalFrameWidthaOne: '璇疯緭鍏ラ棿闅旀瀹藉害1',
+ intervalFrameWidthaTwo: '璇疯緭鍏ラ棿闅旀瀹藉害2',
+ intervalFrameWidthaThree: '璇疯緭鍏ラ棿闅旀瀹藉害3',
+ intervalFrameWidthaFour: '璇疯緭鍏ラ棿闅旀瀹藉害4',
+ intervalFrameWidthbOne: '闂撮殧妗嗗搴�1锛�',
+ intervalFrameWidthbTwo: '闂撮殧妗嗗搴�2锛�',
+ intervalFrameWidthbThree: '闂撮殧妗嗗搴�3锛�',
+ intervalFrameWidthbFour: '闂撮殧妗嗗搴�4锛�',
sealInsert: '瀵嗗皝宓屽叆',
sealInsertb: '瀵嗗皝宓屽叆锛�',
sealInserta: '璇疯緭鍏ュ瘑灏佸祵鍏�',
--
Gitblit v1.8.0