From 5382d30827792f6cf3fb044297b74bc78db8dae7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 09:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index adad083..3fc49cc 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,10 @@
quit:"Exit",
},
basicData:{
+ untask:'鏃犱换鍔�',
+ up:'涓婄墖',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
printing:'鑷姩鎵撳嵃',
@@ -132,14 +136,21 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
totallogarithms:'鎬诲鏁�',
numberpairs:'閰嶅鏁�',
numberoccupied:'鍗犵敤鏍煎瓙鏁�',
totalfurnaces:'鎬荤倝鏁�',
cagesnumber:'绗煎唴鏁伴噺',
slotnumber:'鍗犳湁鏍煎瓙鏁�',
- progress:'杩涘害',
- temperingpriority:'閽㈠寲浼樺厛绾�',
+ progress:'杩涘害%',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
@@ -290,6 +301,8 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
glassID:'Glass ID',
height:'Height',
width:'Width',
@@ -563,6 +576,7 @@
dreportwork :'Unreported work',
pendingwork :'Pending job application',
reportwork :'Reported work',
+ reportworked :'Reported worked',
incise :'slicing',
edging :'edging',
steel :'toughened',
@@ -596,6 +610,7 @@
premark :'Please enter a note',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'Original film storage details',
warehousing:'store',
@@ -635,6 +650,7 @@
filmsa:'Films锛�',
createtime:'Creation time',
remainquantity:'Remaining Quantity',
+ thickremainquant:'Remaining quantity of original film (sheets)',
thickremainquantity:'Remaining quantity of original film (sheets)锛�',
inquantity:'Please enter the quantity',
quantitya:'Number锛�',
@@ -694,6 +710,18 @@
finegrinding: '绮剧（',
},
hellow: {
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
@@ -829,5 +857,10 @@
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
- }
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0