From 78311acaaf04aab09f400a5c958c9d6cbc2b4aae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 25 七月 2024 13:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 0dbaa83..21ceabd 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:'鏍呮牸鍙�',
@@ -90,8 +91,8 @@
width:'瀹�',
height:'楂�',
startstatus:'鍚敤鐘舵��',
- disable:'绂佺敤',
- start:'鍚敤',
+ disable:'宸茬鐢�',
+ start:'宸插惎鐢�',
deficiencieste:'鎶ョ己',
updown:'浜哄伐涓嬬墖',
operate:'鎿嶄綔',
@@ -168,8 +169,8 @@
gridnumber:'鏍呮牸鍙�',
gridnumbera:'鏍呮牸鍙凤細',
grid:'璇疯緭鍏ユ爡鏍煎彿',
- enable:'鍚敤',
- disable:'绂佺敤',
+ enable:'宸插惎鐢�',
+ disable:'宸茬鐢�',
remainingwidth:'鍓╀綑瀹藉害',
add:'娣诲姞',
sheetID:'閽㈠寲灏忕墖淇℃伅琛↖D',
@@ -205,6 +206,12 @@
down:'涓嬩竴椤�',
now:'褰撳墠椤垫樉绀�',
tit:'鏉℃暟鎹�',
+ temperingqueries:'閽㈠寲鏌ヨ',
+ specifytempering:'鎸囧畾閽㈠寲',
+ projectnumber:'宸ョ▼鍙�',
+ layoutnumber:'閽㈠寲鐗堝浘鍙�',
+ numberglasses:'鐜荤拑鏁伴噺',
+ specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
},
workOrder:{
glassID:'鐜荤拑ID',
@@ -237,7 +244,7 @@
state:'鐘舵��',
devicenumber:'璁惧鍙�',
startstatus:'鍚敤鐘舵��',
- enable:'鍚敤',
+ enable:'宸插惎鐢�',
unenable:'鏈惎鐢�',
operate:'鎿嶄綔',
bindingshelves:'缁戝畾鏋跺瓙',
@@ -410,7 +417,7 @@
notstocked: '鏈叆搴�',
inboundstatus: '閮ㄥ垎鍏ュ簱鐘舵��',
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
-
-
+ completedquantity: '瀹屾垚鏁伴噺',
+ scrapquantity: '鎶ュ簾鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0