From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'
---
UI-Project/src/lang/zh.js | 123 +++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index d365f5b..d2fa6e0 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -199,28 +199,29 @@
tid:'璁惧id',
tida:'璁惧id锛�',
fin:'鏄惁瀹屾垚浠诲姟锛�',
- sureadd:'纭娣诲姞',
- sureadda:'鏄惁纭娣诲姞锛�',
- zailong:'鍦ㄧ涓�',
- rengongxp:'浜哄伐涓嬬墖',
- up:'涓婁竴椤�',
- down:'涓嬩竴椤�',
- now:'褰撳墠椤垫樉绀�',
- tit:'鏉℃暟鎹�',
- temperingqueries:'閽㈠寲鏌ヨ',
- specifytempering:'鎸囧畾閽㈠寲',
- projectnumber:'宸ョ▼鍙�',
- layoutnumber:'閽㈠寲鐗堝浘鍙�',
- numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
- temperedswitch:'閽㈠寲寮�鍏�',
- dutyinformation:'鍊肩彮淇℃伅',
- line:'绾胯矾',
- process:'宸ュ簭',
- team:'鐝粍',
- basic:'璁惧',
+ sureadd: '纭娣诲姞',
+ sureadda: '鏄惁纭娣诲姞锛�',
+ zailong: '鍦ㄧ涓�',
+ rengongxp: '浜哄伐涓嬬墖',
+ up: '涓婁竴椤�',
+ down: '涓嬩竴椤�',
+ now: '褰撳墠椤垫樉绀�',
+ tit: '鏉℃暟鎹�',
+ temperingqueries: '閽㈠寲鏌ヨ',
+ specifytempering: '鎸囧畾涓�鐐�',
+ specifyout: '鎸囧畾浜哄伐鍑虹墖',
+ specifyengineerid: '鎸囧畾宸ョ▼',
+ projectnumber: '宸ョ▼鍙�',
+ layoutnumber: '閽㈠寲鐗堝浘鍙�',
+ numberglasses: '鐜荤拑鏁伴噺',
+ specifytemperinga: '鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ temperedswitch: '閽㈠寲寮�鍏�',
+ dutyinformation: '鍊肩彮淇℃伅',
+ process: '宸ュ簭',
+ team: '鐝粍',
+ basic: '璁惧',
makesure:'纭淇濆瓨',
- cancel:'鍙栨秷',
+ // cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
},
@@ -451,11 +452,9 @@
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
completedquantity: '瀹屾垚鏁伴噺',
scrapquantity: '鎶ュ簾鏁伴噺',
- number: '鏁伴噺',
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
@@ -489,7 +488,6 @@
glassID :'鐜荤拑ID',
projectnumber :'宸ョ▼鍙�',
layoutID :'閽㈠寲鐗堝浘ID',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'鐘舵��',
processcards :'娴佺▼鍗�',
@@ -508,5 +506,82 @@
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 :'宸ヤ綅',
+ },
+ Mounting:{
+ previewproject :'閫夋嫨棰勮宸ョ▼',
+ loadinglinea :'涓婄墖绾�',
+ loadingline :'涓婄墖绾匡細',
+ inloadingline :'璇烽�夋嫨涓婄墖绾�',
+ oneloadingline :'涓�鍙蜂笂鐗囩嚎',
+ twoloadingline :'浜屽彿涓婄墖绾�',
+ waiting :'绛夊緟涓�',
+ setparameters :'璁剧疆鍙傛暟',
+ project :'宸ョ▼鍙�',
+ projecta :'宸ョ▼鍙凤細',
+ width :'鍘熺墖瀹�',
+ height :'鍘熺墖楂�',
+ thickness :'鍘熺墖鍘�',
+ projectnumber :'宸ョ▼鍘熺墖搴忓彿',
+ state :'鐘舵��',
+ createtime :'鍒涘缓鏃堕棿',
+ all :'鍏ㄩ��',
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0