From ed722acfaf6f10ba2e6c3e1b4d68a2552bdde245 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 16:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 79a82cc..875f0a2 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -135,6 +135,8 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ startCell:'鐩爣灞傚彿',
+ endCell:'棰勭暀灞傚彿',
begin:'寮�濮�',
finish:'瀹屾垚',
uncar:'鏈笂杞�',
@@ -517,7 +519,7 @@
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
serial: '宸ヨ壓纭搴忓彿',
- slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
+ slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
width: '瀹�',
height: '楂�',
@@ -560,6 +562,37 @@
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
loading :'姝ｅ湪涓婄墖锛�',
+ brokenNum:'鐮存崯鏁伴噺',
+ inventory:'搴撳瓨',
+ inventoryarea:'搴撳瓨闈㈢Н',
+ shippedQuantity:'宸插彂璐ф暟閲�',
+ reportWorkQuantity:'瀹屽伐鏁伴噺',
+ reportWorkQuantityCount:'鐮存崯鏁伴噺',
+ processId:'娴佺▼鍗″彿',
+
+ historicaltasks1:'鍘熺墖浠撳偍',
+ historicaltasks2:'涓婄墖涓�绾�',
+ historicaltasks3:'涓婄墖浜岀嚎',
+ historicaltasks4:'鍗у紡涓�绾�',
+ historicaltasks5:'鍗у紡浜岀嚎',
+ historicaltasks6:'閽㈠寲澶х悊鐗�',
+ historicaltasks7:'涓┖涓�绾�',
+ historicaltasks8:'涓┖浜岀嚎',
+ historicaltasks9:'涓┖澶х悊鐗�',
+ historicaltasks10:'鐢熶骇缁熻',
+ date:'鏃ユ湡',
+ countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
+ countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
+ countOut: '閽㈠寲鏁伴噺',
+ totalAreaOut: '閽㈠寲闈㈢Н',
+ hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
+ hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
--
Gitblit v1.8.0