From dacf6715218c6061d53220b456c75a559bc5af8f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 11:30:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index b5ed364..79a82cc 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,6 +34,10 @@
quit:"閫�鍑�",
},
basicData:{
+ untask:'鏃犱换鍔�',
+ up:'涓婄墖',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
@@ -131,6 +135,10 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
taskfailure:'浠诲姟澶辫触澶勭悊',
@@ -141,7 +149,7 @@
totalfurnaces:'鎬荤倝鏁�',
cagesnumber:'绗煎唴鏁伴噺',
slotnumber:'鍗犳湁鏍煎瓙鏁�',
- progress:'杩涘害',
+ progress:'杩涘害%',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
@@ -292,11 +300,13 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
glassID:'鐜荤拑ID',
height:'楂�',
width:'瀹�',
thickness:'鍘氬害',
coatingtypes:'鑶滅郴',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
productionsequence:'鍑虹墖椤哄簭',
cardnumber:'娴佺▼鍗″彿',
operate:'鎿嶄綔',
@@ -307,7 +317,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
- glasstype:'鐜荤拑绫诲瀷',
+ glasstype:'鐜荤拑鑶滅郴',
line:'绾胯矾',
status:'鐘舵��',
time:'鏃堕棿娈�',
@@ -599,6 +609,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
@@ -639,6 +650,7 @@
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
inquantity:'璇疯緭鍏ユ暟閲�',
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
@@ -697,6 +709,24 @@
finegrinding: '绮剧（',
},
hellow: {
+ totalLayer: '鎬诲眰鏁�',
+ totalPairQuantity: '鎬婚厤瀵规暟閲�',
+ pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
+ isForceList: '鏄惁寮哄埗',
+ yesisForceList: '寮哄埗',
+ noisForceList: '闈炲己鍒�',
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
@@ -832,5 +862,10 @@
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0