From da3b8f9268253a8da7c7d6d2217693114b48fe28 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 三月 2025 19:49:11 +0800
Subject: [PATCH] 中空理片笼、卧式缓存模块、钢化前大理片笼、原片仓储模块新增历史任务页面,大屏显示页面修改、上片接口判断(部分)

---
 UI-Project/src/lang/en.js |   80 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 33e3bc0..a4945c3 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,24 @@
           takeon:'The arrangement is complete',
       },
       searchOrder:{
+          begin:'寮�濮�',
+          finish:'瀹屾垚',
+          uncar:'鏈笂杞�',
+          inkage:'杩涚墖',
+          successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+          psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+          taskfailure:'浠诲姟澶辫触澶勭悊',
+          ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+          totallogarithms:'鎬诲鏁�',
+          numberpairs:'閰嶅鏁�',
+          numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+          totalfurnaces:'鎬荤倝鏁�',
+          cagesnumber:'绗煎唴鏁伴噺',
+          slotnumber:'鍗犳湁鏍煎瓙鏁�',
+          progress:'杩涘害%',
+          whethersame:'鏄惁鐩稿悓',
+          same:'鐩稿悓',
+          notsame:'涓嶇浉鍚�',
           partask:'浠诲姟閲嶇疆',
           partasks:'鏄惁浠诲姟閲嶇疆锛�',
           empty:'榛樿绌轰换鍔�',
@@ -476,6 +499,7 @@
           createTime :'Return date',
       },
       large:{
+          percent:'Percent',
           time: 'The time of the break',
           number: 'Order number',
           jobnumber: 'Job number',
@@ -546,6 +570,7 @@
           dreportwork :'Unreported work',
           pendingwork :'Pending job application',
           reportwork :'Reported work',
+          reportworked :'Reported worked',
           incise :'slicing',
           edging :'edging',
           steel :'toughened',
@@ -579,6 +604,7 @@
           premark :'Please enter a note',
       },
       film:{
+          fail:'澶辫触',
           mes:'Original film storage details',
           warehousing:'store',
           pwarehousing:'鍏ュ簱璇锋眰',
@@ -676,6 +702,8 @@
           finegrinding: '绮剧(',
       },
       hellow: {
+          freeone: '涓�绾跨┖闂茬姸鎬侊細',
+          freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
           casFour: '姘斾綋4',
           casFourb: '姘斾綋4锛�',
           casFoura: '璇烽�夋嫨姘斾綋4',
@@ -702,17 +730,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: '璇疯緭鍏ュ瘑灏佸祵鍏�',
@@ -782,5 +837,10 @@
           pairQuantity: '鎬婚厤瀵规暟閲忥細',
           cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
           schedulingswitch: '璋冨害寮�鍏�',
-      }
+      },
+    screendisplay:{
+        pwidth: '璇疯緭鍏ュ搴�',
+        pheight: '璇疯緭鍏ラ珮搴�',
+        upnumber: '涓婄墖鏁伴噺',
+    }
   }
\ No newline at end of file

--
Gitblit v1.8.0