From aebc5d85da25b3b352dba1ceb76bacf3f464382b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 四月 2025 17:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index bc0ac98..18b081e 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -176,7 +176,7 @@
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
- undesignate:'鍙栨秷鎸囧畾',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'鎬绘暟閲�',
numbercages:'绗煎瓙鍐呮暟閲�',
missingquantity:'缂哄皯鏁伴噺',
@@ -288,7 +288,7 @@
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
process:'宸ュ簭',
@@ -398,6 +398,12 @@
height:'楂樺害',
},
productStock:{
+ addconfigName:'娣诲姞閰嶇疆',
+ editconfigName:'淇敼閰嶇疆',
+ configName:'閰嶇疆鍚�',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
usernamea:'鐢ㄦ埛鍚嶏細',
@@ -505,6 +511,15 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ load:'鍒囧壊',
+ edg:'纾ㄨ竟',
+ temp:'閽㈠寲',
+ hollow:'涓┖',
+ oneFinish:'涓�绾垮畬鎴�',
+ twoFinish:'浜岀嚎瀹屾垚',
+ oneunFinish:'涓�绾挎湭瀹屾垚',
+ twounFinish:'浜岀嚎鏈畬鎴�',
+ ondDamage:'涓�绾跨牬鎹�',
percent:'杩涘害鐧惧垎姣�',
time: '娆＄牬鏃堕棿',
tionnumber: '璁㈠崟鍙�',
@@ -539,6 +554,7 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
@@ -749,7 +765,7 @@
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
isForceList: '鏄惁寮哄埗',
yesisForceList: '寮哄埗',
- noisForceList: '闈炲己鍒�',
+ noisForceList: '闈炲己鍒�',
hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
--
Gitblit v1.8.0