From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/py.js | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 0f92998..ff992f8 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -34,6 +34,9 @@
quit: "袙褘褏芯写",
},
basicData: {
+ untask:'鏃犱换鍔�',
+ tonumber:'涓婄墖鎬绘暟閲�',
+ finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting: '袦邪褕懈薪邪 谢邪蟹械褉薪芯泄 屑邪褉泻懈褉芯胁泻懈 谐芯褌芯胁邪锛�',
@@ -126,19 +129,38 @@
order: {
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
takeon:'鎽嗙墖瀹屾垚',
+ noGlassToDamage:'袧懈泻邪泻芯谐芯 斜懈褌芯谐芯 褋褌械泻谢邪锛�',
dilapidation: '袩芯胁褉械卸写械薪懈械',
+ dilapidationDetails:'袛械褌邪谢懈 锌芯胁褉械卸写械薪懈褟',
+ dilapidationAll:'袨写薪邪 泻薪芯锌泻邪 写谢褟 锌芯胁褉械卸写械薪懈褟',
+ dilapidationWhether:'小谢芯屑邪械褌褋褟 谢懈 芯薪 芯写薪懈屑 泻谢懈泻芯屑锛�',
takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ loadingText: '鏁版嵁鍔犺浇涓紝璇风◢鍊�...',
+ firstLinePriority: '袩褉懈芯褉懈褌械褌 锌械褉胁芯泄 谢懈薪懈懈',
+ secondLinePriority: '袩褉懈芯褉懈褌械褌 胁褌芯褉芯泄 谢懈薪懈懈',
+ hollowPriority:'涓┖浼樺厛绾�',
+ furnaces:'婊＄倝鐐夋暟',
+ furnfullTemp:'鐜荤拑鎬婚噺',
+ startCell:'鐩爣灞傚彿',
+ endCell:'棰勭暀灞傚彿',
+ begin:'寮�濮�',
+ finish:'瀹屾垚',
+ uncar:'鏈笂杞�',
+ inkage:'杩涚墖',
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
totallogarithms:'鎬诲鏁�',
numberpairs:'閰嶅鏁�',
numberoccupied:'鍗犵敤鏍煎瓙鏁�',
totalfurnaces:'鎬荤倝鏁�',
cagesnumber:'绗煎唴鏁伴噺',
slotnumber:'鍗犳湁鏍煎瓙鏁�',
- progress:'杩涘害',
- temperingpriority:'閽㈠寲浼樺厛绾�',
+ progress:'杩涘害%',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
@@ -163,7 +185,7 @@
searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',
- undesignate:'袘械蟹 芯斜芯蟹薪邪褔械薪懈褟',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'袨斜褖械械 泻芯谢懈褔械褋褌胁芯',
numbercages:'袣芯谢懈褔械褋褌胁芯 褋械锌邪褉邪褌芯褉芯胁',
missingquantity:'袧械写芯褋褌邪褞褖械械 泻芯谢懈褔械褋褌胁芯',
@@ -217,6 +239,7 @@
startstatus: '小褌邪褌褍褋 薪邪褔邪谢邪 芯锌械褉邪褑懈懈',
startstatusa: '小褌邪褌褍褋 薪邪褔邪谢邪 芯锌械褉邪褑懈懈锛�',
instartstatus: '袙胁械写懈褌械 褋芯褋褌芯褟薪懈械 邪泻褌懈胁邪褑懈懈',
+ choicestartstatus:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 芦袙泻谢褞褔懈褌褜 褋褌邪褌褍褋禄',
glassgaps: '小褌械泻谢褟薪薪褘泄 蟹邪蟹芯褉',
glassgapsa: '小褌械泻谢褟薪薪褘泄 蟹邪蟹芯褉锛�',
inglassgaps: '袙胁械写懈褌械 褋褌械泻谢芯 蟹邪蟹芯褉',
@@ -275,10 +298,9 @@
projectnumber:'袧芯屑械褉 锌褉芯械泻褌邪',
layoutnumber:'效械褉褌械卸 薪芯屑械褉 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
- line:'袥懈薪懈褟',
process:'宸ュ簭',
team:'鐝粍',
basic:'璁惧',
@@ -289,6 +311,8 @@
Schedulingswitch:'璋冨害寮�鍏�',
},
workOrder: {
+ upnumber:'涓婄墖浣嶇紪鍙�',
+ coatingtypesbe:'鍘熺墖鑶滅郴',
glassID: '小褌械泻谢褟薪薪褘泄 ID',
height: '袙褘褋芯褌邪',
width: '楔懈褉懈薪邪',
@@ -384,6 +408,11 @@
height: '袙褘褋芯褌邪',
},
productStock: {
+ configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
+ inconfigValue:'袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪褋褌褉芯械薪薪褘械 蟹薪邪褔械薪懈褟',
addusers: '袛芯斜邪胁褜褌械 锌芯谢褜蟹芯胁邪褌械谢械泄.',
username: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.',
usernamea: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.锛�',
@@ -491,8 +520,10 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ patchCount:'宸茶ˉ鏁伴噺',
+ slice:'鐗�',
time: '娆＄牬鏃堕棿',
- number: '璁㈠崟鍙�',
+ tionnumber: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
productionnumber: '鐢熶骇璁㈠崟鍙�',
cardnumber: '袧芯屑械褉 泻邪褉褌芯褔泻懈 锌褉芯褑械褋褋邪',
@@ -502,6 +533,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
numberpatches: '琛ョ墖鏁伴噺',
@@ -524,7 +556,9 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '袣芯谢懈褔械褋褌胁芯',
@@ -539,7 +573,6 @@
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '袧芯屑械褉 锌褉芯械泻褌邪',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
@@ -574,7 +607,6 @@
glassID :'小褌械泻谢褟薪薪褘泄 ID',
projectnumber :'袧芯屑械褉 锌褉芯械泻褌邪',
layoutID :'效械褉褌械卸 ID 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'小芯褋褌芯褟薪懈械',
processcards :'袣邪褉褌芯褔泻邪 锌褉芯褑械褋褋邪',
@@ -595,6 +627,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ resetnumber:'鏋跺瓙鍙�',
fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
@@ -612,7 +645,6 @@
delete:'校写邪谢',
outbound:'鍑哄簱',
deviceid:'璁惧ID',
- slot:'携褔械械泻 褋械褌泻谢邪',
enablestatea:'鍚敤鏍囪',
disable:'袨褌泻谢褞褔',
start:'袧邪褔邪谢芯',
@@ -634,12 +666,13 @@
filmsa:'孝懈锌褘 锌芯泻褉褘褌懈泄锛�',
createtime:'鍒涘缓鏃堕棿',
remainquantity:'鍓╀綑鏁伴噺',
+ thickremainquant:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛�',
thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
inquantity:'袙胁械写懈褌械 泻芯谢褜褔械褋褌胁芯.',
quantitya:'袣芯谢懈褔械褋褌胁芯锛�',
enableid:'浠诲姟ID',
originateslot:'璧峰鏍煎瓙',
- endslot:'鐩爣鏍煎瓙',
+ endoriginateslot:'鐩爣鏍煎瓙',
patternquantity:'鍘熺墖鏁伴噺',
enabletype:'浠诲姟绫诲瀷',
enablestate:'宸ヤ綅鐘舵��',
@@ -657,10 +690,8 @@
taskstatus :'小芯褋褌芯褟薪懈械 蟹邪写邪褔懈',
built :'鏂板缓',
execution :'鎵ц涓�',
- finish :'瀹屾垚',
tasktype :'浠诲姟绫诲瀷',
stocke :'鍏ュ簱',
- outbound :'鍑哄簱',
dispatch :'璋冨害',
inquire :'鏌ヨ',
station :'袪邪斜芯褔械械 屑械褋褌芯',
@@ -693,8 +724,41 @@
finegrinding: '绮剧（',
},
hellow: {
+ content:'鍐呭',
+ idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
+ sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+ clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+ logarithm: '瀵规暟锛�',
+ totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
+ pairQuantitya: '宸插嚭閰嶅鏁�',
+ waitingout: '绛夊緟鍑虹墖',
+ finishout: '鍑虹墖瀹屾垚',
+ hollowSequence: '涓┖椤哄簭',
+ isPair: '鏄惁閰嶅',
+ no: '鍚�',
+ listFormula: '閰嶆柟淇℃伅',
+ HollowGlass: '闃熷垪淇℃伅',
+ totalLayer: '鎬诲眰鏁�',
+ totalPairQuantity: '鎬婚厤瀵规暟閲�',
+ pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
+ isForceList: '鏄惁寮哄埗',
+ yesisForceList: '寮哄埗',
+ noisForceList: '闈炲己鍒�',
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
+ freethree: '涓夌嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -813,6 +877,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
@@ -825,8 +890,14 @@
realpieces: '瀹為檯鐗囨暟',
route: '璺嚎锛�',
croute: '璇烽�夋嫨璺嚎',
- pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
+ },
+ screendisplay:{
+ pchoice: '璇烽�夋嫨',
+ pwidth: '璇疯緭鍏ュ搴�',
+ pheight: '璇疯緭鍏ラ珮搴�',
+ upnumber: '涓婄墖鏁伴噺',
}
}
\ No newline at end of file
--
Gitblit v1.8.0