From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 155 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 224e10b..d1de9eb 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -83,6 +83,7 @@
updatanull:'璇ュ伐绋嬫湭淇濆瓨鍒颁笂鐗囪〃锛�',
glassnull:'鏇存柊鐜荤拑鐘舵�佹椂鍙戠敓閿欒',
deletemessage:'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+ layoutSequence:'搴忓彿',
},
sorter:{
gridnumber:'鏍呮牸鍙�',
@@ -103,7 +104,8 @@
},
order:{
dilapidation:'鐮存崯',
- Takeaway:'浜哄伐鎷胯蛋',
+ takeaway:'浜哄伐鎷胯蛋',
+ takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
cageinformation:'鐞嗙墖绗间俊鎭�',
@@ -205,6 +207,22 @@
down:'涓嬩竴椤�',
now:'褰撳墠椤垫樉绀�',
tit:'鏉℃暟鎹�',
+ temperingqueries:'閽㈠寲鏌ヨ',
+ specifytempering:'鎸囧畾涓�鐐�',
+ specifyengineerid:'鎸囧畾宸ョ▼',
+ projectnumber:'宸ョ▼鍙�',
+ layoutnumber:'閽㈠寲鐗堝浘鍙�',
+ numberglasses:'鐜荤拑鏁伴噺',
+ specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ temperedswitch:'閽㈠寲寮�鍏�',
+ dutyinformation:'鍊肩彮淇℃伅',
+ process:'宸ュ簭',
+ team:'鐝粍',
+ basic:'璁惧',
+ makesure:'纭淇濆瓨',
+ // cancel:'鍙栨秷',
+ temperingtotal:'閽㈠寲鐐夋暟锛�',
+ glasstotal:'鐜荤拑鎬绘暟锛�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -222,11 +240,32 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
+ glasstype:'鐜荤拑绫诲瀷',
+ line:'绾胯矾',
+ status:'鐘舵��',
},
processCard:{
intofurnace:'杩涚倝涓�',
beforefurnace:'杩涚倝鍓�',
outfurnace:'宸插嚭鐐夌幓鐠�',
+ print:'鎷胯蛋鎵撳嵃',
+ printing:'鎵撳嵃',
+ projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
+ inquire:'鏌ヨ',
+ project:'宸ョ▼鍙�',
+ awayprocess:'鎷胯蛋宸ュ簭',
+ awayequipment:'鎷胯蛋璁惧',
+ awayteam:'鎷胯蛋鐝粍',
+ flowcard:'娴佺▼鍗�',
+ layer:'灞傚彿',
+ temperinglayout:'鐐夊彿',
+ temperingfeed:'鐗囧簭',
+ width:'瀹�',
+ height:'楂�',
+ thickness:'鍘�',
+ glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
+ layoutID:'鐗堝浘ID',
+ glassID:'鐜荤拑ID',
},
reportWork:{
lowerbit:'涓嬬墖浣�',
@@ -404,13 +443,124 @@
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
- quantity: '鍖呰鏂瑰紡',
+ quantity: '鏁伴噺',
warehousing: '鐘舵��',
deliveryDate: '閫佽揣鏃堕棿',
notstocked: '鏈叆搴�',
inboundstatus: '閮ㄥ垎鍏ュ簱鐘舵��',
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
-
-
- }
+ completedquantity: '瀹屾垚鏁伴噺',
+ scrapquantity: '鎶ュ簾鏁伴噺',
+ method: '鍔犲伐鏂瑰紡',
+ innumber: '宸插叆鏁伴噺',
+ productstatus: '鐢熶骇鐘舵��',
+ right: '姝ｅ父',
+ stop: '缁堟',
+ inquire: '鏌ヨ',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ loading :'姝ｅ湪涓婄墖锛�',
+ },
+ reportmanage:{
+ productiontime :'鐢熶骇鏃堕棿',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ ctype :'娓呴�夋嫨绫诲瀷',
+ cstate :'娓呴�夋嫨鐘舵��',
+ cprocess :'娓呴�夋嫨宸ュ簭',
+ all :'鍏ㄩ儴',
+ completed :'瀹屽伐',
+ broke :'鐮存崯',
+ takeout :'鎷胯蛋',
+ dreportwork :'鏈姤宸�',
+ pendingwork :'寰呮姤宸�',
+ reportwork :'宸叉姤宸�',
+ incise :'鍒囧壊',
+ edging :'纾ㄨ竟',
+ steel :'閽㈠寲',
+ inquire :'鏌ヨ',
+ signingwork :'鎶ュ伐',
+ reporteam :'鎶ュ伐鐝粍',
+ reportingequipment :'鎶ュ伐璁惧',
+ line :'绾胯矾',
+ process :'宸ュ簭',
+ glassID :'鐜荤拑ID',
+ projectnumber :'宸ョ▼鍙�',
+ layoutID :'閽㈠寲鐗堝浘ID',
+ type :'绫诲瀷',
+ state :'鐘舵��',
+ processcards :'娴佺▼鍗�',
+ number :'搴忓彿',
+ layer :'灞�',
+ typebreakage :'鐮存崯绫诲瀷',
+ ptypebreakage :' 璇烽�夋嫨鐮存崯绫诲瀷',
+ causebreakage :'鐮存崯鍘熷洜',
+ pcausebreakage :'璇烽�夋嫨鐮存崯鍘熷洜',
+ responsibleprocess :'璐ｄ换宸ュ簭',
+ responsiblepersonnel :'璐ｄ换浜哄憳',
+ presponsiblepersonnel :'璇疯緭鍏ヨ矗浠讳汉鍛�',
+ responsibleteam :'璐ｄ换鐝粍',
+ presponsibleteam :'璇烽�夋嫨璐ｄ换鐝粍',
+ responsibleequipment :'璐ｄ换璁惧',
+ presponsibleequipment :'璇烽�夋嫨璐ｄ换璁惧',
+ remark :'澶囨敞',
+ premark :'璇疯緭鍏ュ娉�',
+ },
+ film:{
+ mes:'鍘熺墖浠撳偍璇︽儏',
+ warehousing:'鍏ュ簱',
+ operate: '鎿嶄綔',
+ exit:'缂栬緫',
+ delete:'鍒犻櫎',
+ outbound:'鍑哄簱',
+ deviceid:'璁惧ID',
+ slot:'鏍呮牸鍙�',
+ enablestatea:'鍚敤鏍囪',
+ disable:'绂佺敤',
+ start:'鍚敤',
+ startslot:'寮�濮嬪伐浣�',
+ endslot:'鐩爣宸ヤ綅',
+ slotid:'鏍煎瓙ID',
+ width:'鍘熺墖瀹�',
+ widtha:'鍘熺墖瀹斤細',
+ inwidth:'璇疯緭鍏ュ師鐗囧',
+ height:'鍘熺墖楂�',
+ inheight:'璇疯緭鍏ュ師鐗囬珮',
+ heighta:'鍘熺墖楂橈細',
+ thickness:'鍘熺墖鍘氬害',
+ inthickness:'璇疯緭鍏ュ師鐗囧帤搴�',
+ thicknessa:'鍘熺墖鍘氬害锛�',
+ films:'鑶滅郴',
+ infilms:'璇疯緭鍏ヨ啘绯�',
+ filmsa:'鑶滅郴锛�',
+ createtime:'鍒涘缓鏃堕棿',
+ remainquantity:'鍓╀綑鏁伴噺',
+ thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ inquantity:'璇疯緭鍏ユ暟閲�',
+ quantitya:'鏁伴噺锛�',
+ enableid:'浠诲姟ID',
+ originateslot:'璧峰鏍煎瓙',
+ patternquantity:'鍘熺墖鏁伴噺',
+ enabletype:'浠诲姟绫诲瀷',
+ enablestate:'宸ヤ綅鐘舵��',
+ finish:'宸插畬鎴�',
+ unfinish:'鏈畬鎴�',
+ dedelete:'鏄惁鍒犻櫎璇ユ潯鍐呭锛�',
+ dedisable:'鏄惁绂佺敤璇ユ潯鍐呭锛�',
+ deoutbound:'鏄惁鍑哄簱璇ユ潯鍐呭锛�',
+ selectwarehousing:'璇烽�夋嫨鍚婅浣�',
+ inwarehousing:'鍚婅浣嶏細',
+ warehousing1:'鍚婅浣�1',
+ warehousing2:'鍚婅浣�2',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ taskstatus :'浠诲姟鐘舵��',
+ built :'鏂板缓',
+ execution :'鎵ц涓�',
+ tasktype :'浠诲姟绫诲瀷',
+ stocke :'鍏ュ簱',
+ dispatch :'璋冨害',
+ inquire :'鏌ヨ',
+ station :'宸ヤ綅',
+ },
}
\ No newline at end of file
--
Gitblit v1.8.0