From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/lang/zh.js | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 6c28d39..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,10 +288,9 @@
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
- line:'绾胯矾',
process:'宸ュ簭',
team:'鐝粍',
basic:'璁惧',
@@ -399,6 +398,12 @@
height:'楂樺害',
},
productStock:{
+ addconfigName:'娣诲姞閰嶇疆',
+ editconfigName:'淇敼閰嶇疆',
+ configName:'閰嶇疆鍚�',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ configValuea:'閰嶇疆鍊硷細',
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
usernamea:'鐢ㄦ埛鍚嶏細',
@@ -506,9 +511,18 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ load:'鍒囧壊',
+ edg:'纾ㄨ竟',
+ temp:'閽㈠寲',
+ hollow:'涓┖',
+ oneFinish:'涓�绾垮畬鎴�',
+ twoFinish:'浜岀嚎瀹屾垚',
+ oneunFinish:'涓�绾挎湭瀹屾垚',
+ twounFinish:'浜岀嚎鏈畬鎴�',
+ ondDamage:'涓�绾跨牬鎹�',
percent:'杩涘害鐧惧垎姣�',
time: '娆＄牬鏃堕棿',
- number: '璁㈠崟鍙�',
+ tionnumber: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
productionnumber: '鐢熶骇璁㈠崟鍙�',
cardnumber: '娴佺▼鍗″彿',
@@ -540,6 +554,7 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
@@ -555,7 +570,6 @@
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
@@ -620,7 +634,6 @@
glassID :'鐜荤拑ID',
projectnumber :'宸ョ▼鍙�',
layoutID :'閽㈠寲鐗堝浘ID',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'鐘舵��',
processcards :'娴佺▼鍗�',
@@ -659,7 +672,6 @@
delete:'鍒犻櫎',
outbound:'鍑哄簱',
deviceid:'璁惧ID',
- slot:'鏍呮牸鍙�',
enablestatea:'鍚敤鏍囪',
disable:'绂佺敤',
start:'鍚敤',
@@ -687,7 +699,7 @@
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
originateslot:'璧峰鏍煎瓙',
- endslot:'鐩爣鏍煎瓙',
+ endoriginateslot:'鐩爣鏍煎瓙',
patternquantity:'鍘熺墖鏁伴噺',
enabletype:'浠诲姟绫诲瀷',
enablestate:'宸ヤ綅鐘舵��',
@@ -705,10 +717,8 @@
taskstatus :'浠诲姟鐘舵��',
built :'鏂板缓',
execution :'鎵ц涓�',
- finish :'瀹屾垚',
tasktype :'浠诲姟绫诲瀷',
stocke :'鍏ュ簱',
- outbound :'鍑哄簱',
dispatch :'璋冨害',
inquire :'鏌ヨ',
station :'宸ヤ綅',
@@ -755,7 +765,7 @@
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
isForceList: '鏄惁寮哄埗',
yesisForceList: '寮哄埗',
- noisForceList: '闈炲己鍒�',
+ noisForceList: '闈炲己鍒�',
hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
@@ -901,7 +911,7 @@
realpieces: '瀹為檯鐗囨暟',
route: '璺嚎锛�',
croute: '璇烽�夋嫨璺嚎',
- pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
},
--
Gitblit v1.8.0