From 29f8c2e989cd6d9d3e93b1ac511dbd9e14b8b338 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 23:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 33e3bc0..76000bd 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:'鍏朵粬',
@@ -476,6 +481,7 @@
createTime :'Return date',
},
large:{
+ percent:'Percent',
time: 'The time of the break',
number: 'Order number',
jobnumber: 'Job number',
@@ -579,6 +585,7 @@
premark :'Please enter a note',
},
film:{
+ fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -676,6 +683,8 @@
finegrinding: '绮剧（',
},
hellow: {
+ freeone: '涓�绾跨┖闂茬姸鎬侊細',
+ freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -702,17 +711,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