From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 08f5d92..9ea19cf 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:'鎵撴爣鏈哄氨缁姸鎬侊細',
@@ -296,11 +300,13 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
+ upnumber:'涓婄墖浣嶇紪鍙�',
glassID:'鐜荤拑ID',
height:'楂�',
width:'瀹�',
thickness:'鍘氬害',
coatingtypes:'鑶滅郴',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
productionsequence:'鍑虹墖椤哄簭',
cardnumber:'娴佺▼鍗″彿',
operate:'鎿嶄綔',
@@ -311,7 +317,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
- glasstype:'鐜荤拑绫诲瀷',
+ glasstype:'鐜荤拑鑶滅郴',
line:'绾胯矾',
status:'鐘舵��',
time:'鏃堕棿娈�',
@@ -511,7 +517,7 @@
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
serial: '宸ヨ壓纭搴忓彿',
- slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
+ slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
width: '瀹�',
height: '楂�',
@@ -554,6 +560,38 @@
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
loading :'姝ｅ湪涓婄墖锛�',
+ brokenNum:'鐮存崯鏁伴噺',
+ inventory:'搴撳瓨',
+ inventoryarea:'搴撳瓨闈㈢Н',
+ shippedQuantity:'宸插彂璐ф暟閲�',
+ reportWorkQuantity:'瀹屽伐鏁伴噺',
+ reportWorkQuantityCount:'鐮存崯鏁伴噺',
+ processId:'娴佺▼鍗″彿',
+
+ historicaltasks1:'鍘熺墖浠撳偍',
+ historicaltasks2:'涓婄墖涓�绾�',
+ historicaltasks3:'涓婄墖浜岀嚎',
+ historicaltasks4:'纾ㄨ竟浠诲姟',
+ historicaltasks5:'鍗у紡涓�绾�',
+ historicaltasks6:'鍗у紡浜岀嚎',
+ historicaltasks7:'閽㈠寲澶х悊鐗�',
+ historicaltasks8:'涓┖涓�绾�',
+ historicaltasks9:'涓┖浜岀嚎',
+ historicaltasks10:'涓┖澶х悊鐗�',
+ historicaltasks11:'鐢熶骇缁熻',
+ date:'鏃ユ湡',
+ countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
+ countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ totalAreaOutTwo: '鍒囧壊涓�绾块潰绉�',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
+ countOut: '閽㈠寲鏁伴噺',
+ totalAreaOut: '閽㈠寲闈㈢Н',
+ hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
+ hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
@@ -603,6 +641,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
@@ -643,6 +682,7 @@
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
inquantity:'璇疯緭鍏ユ暟閲�',
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
@@ -701,6 +741,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',
@@ -836,5 +894,10 @@
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
+ },
+ screendisplay:{
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0