From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index f849d93..4287482 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锛�',
@@ -127,6 +129,8 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ partask:'浠诲姟閲嶇疆',
+ partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
historicaltasks:'鍘嗗彶浠诲姟',
cagedetails:'绗煎唴璇︽儏',
@@ -577,6 +581,7 @@
premark :'Please enter a note',
},
film:{
+ fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -669,14 +674,107 @@
removalmethodp: '闄よ啘鏂瑰紡',
removalmethoda: '闄よ啘鏂瑰紡锛�',
noremoval: '涓嶉櫎鑶�',
+ removal: '闄よ啘',
coarselyground: '绮楃（',
finegrinding: '绮剧（',
},
hellow: {
+ freeone: '涓�绾跨┖闂茬姸鎬侊細',
+ freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
+ casFour: '姘斾綋4',
+ casFourb: '姘斾綋4锛�',
+ casFoura: '璇烽�夋嫨姘斾綋4',
+ casOne: '姘斾綋1',
+ casOneb: '姘斾綋1锛�',
+ casOnea: '璇烽�夋嫨姘斾綋1',
+ casThree: '姘斾綋3',
+ casThreeb: '姘斾綋3锛�',
+ casThreea: '璇烽�夋嫨姘斾綋3',
+ casTwo: '姘斾綋2',
+ casTwob: '姘斾綋2锛�',
+ casTwoa: '璇烽�夋嫨姘斾綋2',
+ Y: '鏈�',
+ F: '鏃�',
+ frameFour: '闂撮殧鏉�4',
+ frameFourb: '闂撮殧鏉�4锛�',
+ frameFoura: '璇疯緭鍏ラ棿闅旀澘4',
+ frameOne: '闂撮殧鏉�1',
+ frameOneb: '闂撮殧鏉�1锛�',
+ frameOnea: '璇疯緭鍏ラ棿闅旀澘1',
+ frameThree: '闂撮殧鏉�3',
+ frameThreeb: '闂撮殧鏉�3锛�',
+ frameThreea: '璇疯緭鍏ラ棿闅旀澘3',
+ frameTwo: '闂撮殧鏉�2',
+ frameTwob: '闂撮殧鏉�2锛�',
+ frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
+ 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: '閾濋棿闅旀潯',
+ 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: '璇疯緭鍏ュ瘑灏佸祵鍏�',
+ hollowformula: '涓┖閰嶆柟',
+ hollowformuldet: '鏄惁鍒犻櫎璇ヤ腑绌洪厤鏂癸紵',
+ hollowtaskdet: '鏄惁鍒犻櫎璇ヤ换鍔★紵',
+ taskdet: '鍒犻櫎浠诲姟',
+ edithollowformula: '淇敼涓┖閰嶆柟',
+ phollowformula: '璇烽�夋嫨涓┖閰嶆柟',
+ hollowformulp: '涓┖閰嶆柟锛�',
+ bottomRemove: '涓嬩晶闄よ啘閲忥細',
+ bottomRemovep: '涓嬩晶闄よ啘閲�',
+ bottomRemovea: '璇疯緭鍏ヤ笅渚ч櫎鑶滈噺',
+ topRemove: '涓婁晶闄よ啘閲忥細',
+ topRemovep: '涓婁晶闄よ啘閲�',
+ topRemovea: '璇疯緭鍏ヤ笂渚ч櫎鑶滈噺',
+ leftRemove: '宸︿晶闄よ啘閲忥細',
+ leftRemovep: '宸︿晶闄よ啘閲�',
+ leftRemovea: '璇疯緭鍏ュ乏渚ч櫎鑶滈噺',
+ rightRemove: '鍙充晶闄よ啘閲忥細',
+ rightRemovep: '鍙充晶闄よ啘閲�',
+ rightRemovea: '璇疯緭鍏ュ彸渚ч櫎鑶滈噺',
+ formulaNamep: '閰嶆柟鍚�',
+ formulaName: '閰嶆柟鍚嶏細',
+ formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
stopproject: '鏆傚仠浠诲姟',
pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
reviewproject: '棰勮宸ョ▼',
line: '绾胯矾',
+ linea: '绾胯矾锛�',
line1: '绾胯矾涓�',
line2: '绾胯矾浜�',
line3: '绾胯矾涓�',
@@ -690,19 +788,20 @@
linenumber: '杩涘叆涓┖绾挎暟閲忥細',
order: '鍑虹墖椤哄簭',
flowCardId: '娴佺▼鍗�',
- thickness: 'Thickness',
- coatingtypes: 'Coating types',
+ thickness: '鍘氬害',
+ coatingtypes: '鑶滅郴',
layer: '灞傛暟',
height: '闀�',
- width: 'Width',
- state: 'Status',
- cardnumber: 'Process card number',
- cardnumbera: 'Process card number锛�',
+ width: '瀹�',
+ state: '鐘舵��',
+ cardnumber: '娴佺▼鍗″彿',
+ cardnumbera: '娴佺▼鍗″彿锛�',
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
missingnumber: '缂虹墖鏁伴噺',
- operate: 'Operate',
+ damagenumber: '鐮存崯鏁伴噺',
+ operate: '鎿嶄綔',
claimquest: '棰嗗彇浠诲姟',
pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
missingfilms: '缂虹墖璇︽儏',
--
Gitblit v1.8.0