From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 113d83b..7bb85de 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,6 +34,7 @@
quit:"閫�鍑�",
},
basicData:{
+ printing:'鑷姩鎵撳嵃',
laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
cuttingmachine:'鍒囧壊鏈哄氨缁姸鎬侊細',
machine:'涓婄墖鏈鸿仈鏈虹姸鎬侊細',
@@ -86,6 +87,20 @@
layoutSequence:'搴忓彿',
},
sorter:{
+ inPlace:'鍒颁綅',
+ ninPlace:'鏈埌浣�',
+ emptymissions:'绌轰换鍔�',
+ advancetask:'杩涚墖浠诲姟',
+ outputtasks:'鍑虹墖浠诲姟',
+ straighttasks:'鐩撮�氫换鍔�',
+ endingtask:'缁撴潫',
+ another:'鍏朵粬',
+ id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+ remainWidth:'鍓╀綑',
+ taskRunning:'浠诲姟璇锋眰',
+ updateTime:'鏇存柊鏃堕棿',
+ place:'鏄惁鍒颁綅',
+ layernow:'褰撳墠灞傚彿',
gridnumber:'鏍呮牸鍙�',
glassnumber:'鐜荤拑缂栧彿',
width:'瀹�',
@@ -103,11 +118,21 @@
cancel:'鍙栨秷',
},
order:{
+ projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
dilapidation:'鐮存崯',
takeaway:'浜哄伐鎷胯蛋',
+ takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
+ processcard:'鎸囧畾娴佺▼鍗�',
+ filminformation:'浜哄伐涓嬬墖淇℃伅',
+ currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
+ printlabels:'鎵撳嵃鏍囩',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
@@ -231,9 +256,10 @@
team:'鐝粍',
basic:'璁惧',
makesure:'纭淇濆瓨',
- cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
+ Labelprinting:'鏍囩鎵撳嵃',
+ Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -330,7 +356,6 @@
width:'瀹藉害',
height:'楂樺害',
},
-
productStock:{
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
@@ -401,14 +426,11 @@
},
replenish:{
patchManagement:'琛ョ墖绠＄悊',
-
},
rework:{
reworkManagement:'杩斿伐绠＄悊',
addRework:"杩斿伐鏂板 ",
},
-
-
role:{
id:'ID',
characterHomepage:'瑙掕壊棣栭〉',
@@ -502,9 +524,9 @@
productiontime :'鐢熶骇鏃堕棿',
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
- ctype :'娓呴�夋嫨绫诲瀷',
- cstate :'娓呴�夋嫨鐘舵��',
- cprocess :'娓呴�夋嫨宸ュ簭',
+ ctype :'璇烽�夋嫨绫诲瀷',
+ cstate :'璇烽�夋嫨鐘舵��',
+ cprocess :'璇烽�夋嫨宸ュ簭',
all :'鍏ㄩ儴',
completed :'瀹屽伐',
broke :'鐮存崯',
@@ -641,6 +663,10 @@
finegrinding: '绮剧（',
},
hellow: {
+ line: '绾胯矾',
+ line1: '绾胯矾涓�',
+ line2: '绾胯矾浜�',
+ line3: '绾胯矾涓�',
createtask: '鍒涘缓浠诲姟',
starttask: '寮�濮嬩换鍔�',
pstarttask: '鏄惁寮�濮嬩换鍔★紵',
@@ -650,8 +676,10 @@
claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
linenumber: '杩涘叆涓┖绾挎暟閲忥細',
order: '鍑虹墖椤哄簭',
+ flowCardId: '娴佺▼鍗�',
thickness: '鍘氬害',
coatingtypes: '鑶滅郴',
+ layer: '灞傛暟',
height: '闀�',
width: '瀹�',
state: '鐘舵��',
@@ -661,6 +689,7 @@
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
missingnumber: '缂虹墖鏁伴噺',
+ damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
claimquest: '棰嗗彇浠诲姟',
pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
@@ -668,5 +697,11 @@
forcedfilming: '寮哄埗鍑虹墖',
pforcedfilming: '鏄惁寮哄埗鍑虹墖锛�',
brokenpieces: '鐮存崯鐗囨暟',
+ realpieces: '瀹為檯鐗囨暟',
+ route: '璺嚎锛�',
+ croute: '璇烽�夋嫨璺嚎',
+ pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
+ schedulingswitch: '璋冨害寮�鍏�',
}
}
\ No newline at end of file
--
Gitblit v1.8.0