From ed1fd75b5df2231be1c2d3f643ce75ee29313cfd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 09 十二月 2024 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 84 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 764f1f3..2a3e314 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -234,6 +234,8 @@
cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
+ Labelprinting:'鏍囩鎵撳嵃',
+ Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -615,23 +617,65 @@
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
+ previewproject: '閫夋嫨棰勮宸ョ▼',
+ loadinglinea: '涓婄墖绾�',
+ loadingline: '涓婄墖绾匡細',
+ inloadingline: '璇烽�夋嫨涓婄墖绾�',
+ oneloadingline: '涓�鍙蜂笂鐗囩嚎',
+ twoloadingline: '浜屽彿涓婄墖绾�',
+ waiting: '绛夊緟涓�',
+ pass: '閫氳繃',
+ setparameters: '璁剧疆鍙傛暟',
+ project: '宸ョ▼鍙�',
+ projecta: '宸ョ▼鍙凤細',
+ width: '鍘熺墖瀹�',
+ height: '鍘熺墖楂�',
+ thickness: '鍘熺墖鍘�',
+ projectnumber: '宸ョ▼鍘熺墖搴忓彿',
+ state: '鐘舵��',
+ createtime: '鍒涘缓鏃堕棿',
+ all: '鍏ㄩ��',
+ removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
+ removalmethodp: '闄よ啘鏂瑰紡',
+ removalmethoda: '闄よ啘鏂瑰紡锛�',
+ noremoval: '涓嶉櫎鑶�',
+ coarselyground: '绮楃（',
+ finegrinding: '绮剧（',
+ },
+ hellow: {
+ createtask: '鍒涘缓浠诲姟',
+ starttask: '寮�濮嬩换鍔�',
+ pstarttask: '鏄惁寮�濮嬩换鍔★紵',
+ stoptask: '鍋滄浠诲姟',
+ pstoptask: '鏄惁鍋滄浠诲姟锛�',
+ currenttask: '褰撳墠浠诲姟锛�',
+ claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
+ linenumber: '杩涘叆涓┖绾挎暟閲忥細',
+ order: '鍑虹墖椤哄簭',
+ thickness: '鍘氬害',
+ coatingtypes: '鑶滅郴',
+ layer: '灞傛暟',
+ height: '闀�',
+ width: '瀹�',
+ state: '鐘舵��',
+ cardnumber: '娴佺▼鍗″彿',
+ cardnumbera: '娴佺▼鍗″彿锛�',
+ layernumber: '灞傚彿',
+ totalnumber: '鎬荤墖鏁�',
+ pairsnumber: '宸查厤瀵规暟閲�',
+ missingnumber: '缂虹墖鏁伴噺',
+ operate: '鎿嶄綔',
+ claimquest: '棰嗗彇浠诲姟',
+ pclaimquest: '鏄惁棰嗗彇浠诲姟锛�',
+ missingfilms: '缂虹墖璇︽儏',
+ forcedfilming: '寮哄埗鍑虹墖',
+ pforcedfilming: '鏄惁寮哄埗鍑虹墖锛�',
+ brokenpieces: '鐮存崯鐗囨暟',
+ realpieces: '瀹為檯鐗囨暟',
+ route: '璺嚎锛�',
+ croute: '璇烽�夋嫨璺嚎',
+ pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
+ schedulingswitch: '璋冨害寮�鍏�',
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0