From bbbe207791b13ad5781ec6fcffff23ec5d9f999e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 13 三月 2025 14:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8855c3f..8541fa7 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,21 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害%',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
@@ -281,11 +300,13 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
glassID:'鐜荤拑ID',
height:'楂�',
width:'瀹�',
thickness:'鍘氬害',
coatingtypes:'鑶滅郴',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
productionsequence:'鍑虹墖椤哄簭',
cardnumber:'娴佺▼鍗″彿',
operate:'鎿嶄綔',
@@ -588,6 +609,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
@@ -628,6 +650,7 @@
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
inquantity:'璇疯緭鍏ユ暟閲�',
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
@@ -821,5 +844,10 @@
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0