From e1b67543e8266ed0be67bbd5e3d7c3fa4fcb0740 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 12 十月 2025 10:08:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/py.js | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index cf00894..ff992f8 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -129,11 +129,20 @@
order: {
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
takeon:'鎽嗙墖瀹屾垚',
+ noGlassToDamage:'袧懈泻邪泻芯谐芯 斜懈褌芯谐芯 褋褌械泻谢邪锛�',
dilapidation: '袩芯胁褉械卸写械薪懈械',
+ dilapidationDetails:'袛械褌邪谢懈 锌芯胁褉械卸写械薪懈褟',
+ dilapidationAll:'袨写薪邪 泻薪芯锌泻邪 写谢褟 锌芯胁褉械卸写械薪懈褟',
+ dilapidationWhether:'小谢芯屑邪械褌褋褟 谢懈 芯薪 芯写薪懈屑 泻谢懈泻芯屑锛�',
takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ loadingText: '鏁版嵁鍔犺浇涓紝璇风◢鍊�...',
+ firstLinePriority: '袩褉懈芯褉懈褌械褌 锌械褉胁芯泄 谢懈薪懈懈',
+ secondLinePriority: '袩褉懈芯褉懈褌械褌 胁褌芯褉芯泄 谢懈薪懈懈',
+ hollowPriority:'涓┖浼樺厛绾�',
+ furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
endCell:'棰勭暀灞傚彿',
@@ -176,7 +185,7 @@
searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',
- undesignate:'袘械蟹 芯斜芯蟹薪邪褔械薪懈褟',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'袨斜褖械械 泻芯谢懈褔械褋褌胁芯',
numbercages:'袣芯谢懈褔械褋褌胁芯 褋械锌邪褉邪褌芯褉芯胁',
missingquantity:'袧械写芯褋褌邪褞褖械械 泻芯谢懈褔械褋褌胁芯',
@@ -230,6 +239,7 @@
startstatus: '小褌邪褌褍褋 薪邪褔邪谢邪 芯锌械褉邪褑懈懈',
startstatusa: '小褌邪褌褍褋 薪邪褔邪谢邪 芯锌械褉邪褑懈懈锛�',
instartstatus: '袙胁械写懈褌械 褋芯褋褌芯褟薪懈械 邪泻褌懈胁邪褑懈懈',
+ choicestartstatus:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 芦袙泻谢褞褔懈褌褜 褋褌邪褌褍褋禄',
glassgaps: '小褌械泻谢褟薪薪褘泄 蟹邪蟹芯褉',
glassgapsa: '小褌械泻谢褟薪薪褘泄 蟹邪蟹芯褉锛�',
inglassgaps: '袙胁械写懈褌械 褋褌械泻谢芯 蟹邪蟹芯褉',
@@ -288,7 +298,7 @@
projectnumber:'袧芯屑械褉 锌褉芯械泻褌邪',
layoutnumber:'效械褉褌械卸 薪芯屑械褉 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
process:'宸ュ簭',
@@ -398,6 +408,11 @@
height: '袙褘褋芯褌邪',
},
productStock: {
+ configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ inconfigValue:'袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪褋褌褉芯械薪薪褘械 蟹薪邪褔械薪懈褟',
addusers: '袛芯斜邪胁褜褌械 锌芯谢褜蟹芯胁邪褌械谢械泄.',
username: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.',
usernamea: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.锛�',
@@ -505,6 +520,8 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ patchCount:'宸茶ˉ鏁伴噺',
+ slice:'鐗�',
time: '娆＄牬鏃堕棿',
tionnumber: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
@@ -516,6 +533,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
numberpatches: '琛ョ墖鏁伴噺',
@@ -540,6 +558,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '袣芯谢懈褔械褋褌胁芯',
@@ -705,6 +724,11 @@
finegrinding: '绮剧（',
},
hellow: {
+ content:'鍐呭',
+ idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+ sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+ clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+ logarithm: '瀵规暟锛�',
totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
pairQuantitya: '宸插嚭閰嶅鏁�',
waitingout: '绛夊緟鍑虹墖',
@@ -853,6 +877,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
@@ -870,6 +895,7 @@
schedulingswitch: '璋冨害寮�鍏�',
},
screendisplay:{
+ pchoice: '璇烽�夋嫨',
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
--
Gitblit v1.8.0