From e42b239ac2c2a922172badbe32afaa4ba4f615f8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 14 四月 2025 20:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/py.js | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 3116a90..8b884b7 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -35,7 +35,6 @@
},
basicData: {
untask:'鏃犱换鍔�',
- up:'涓婄墖',
tonumber:'涓婄墖鎬绘暟閲�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
@@ -177,7 +176,7 @@
searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',
- undesignate:'袘械蟹 芯斜芯蟹薪邪褔械薪懈褟',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'袨斜褖械械 泻芯谢懈褔械褋褌胁芯',
numbercages:'袣芯谢懈褔械褋褌胁芯 褋械锌邪褉邪褌芯褉芯胁',
missingquantity:'袧械写芯褋褌邪褞褖械械 泻芯谢懈褔械褋褌胁芯',
@@ -289,10 +288,9 @@
projectnumber:'袧芯屑械褉 锌褉芯械泻褌邪',
layoutnumber:'效械褉褌械卸 薪芯屑械褉 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
- line:'袥懈薪懈褟',
process:'宸ュ簭',
team:'鐝粍',
basic:'璁惧',
@@ -400,6 +398,9 @@
height: '袙褘褋芯褌邪',
},
productStock: {
+ configName:'閰嶇疆鍚�',
+ configCode:'閰嶇疆浠ｇ爜',
+ configValue:'閰嶇疆鍊�',
addusers: '袛芯斜邪胁褜褌械 锌芯谢褜蟹芯胁邪褌械谢械泄.',
username: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.',
usernamea: '袠屑褟 锌芯谢褜蟹芯胁邪褌械谢褟.锛�',
@@ -508,7 +509,7 @@
},
large:{
time: '娆＄牬鏃堕棿',
- number: '璁㈠崟鍙�',
+ tionnumber: '璁㈠崟鍙�',
jobnumber: '鎶ュ伐缂栧彿',
productionnumber: '鐢熶骇璁㈠崟鍙�',
cardnumber: '袧芯屑械褉 泻邪褉褌芯褔泻懈 锌褉芯褑械褋褋邪',
@@ -540,6 +541,7 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
@@ -555,7 +557,6 @@
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '袧芯屑械褉 锌褉芯械泻褌邪',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
@@ -590,7 +591,6 @@
glassID :'小褌械泻谢褟薪薪褘泄 ID',
projectnumber :'袧芯屑械褉 锌褉芯械泻褌邪',
layoutID :'效械褉褌械卸 ID 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'小芯褋褌芯褟薪懈械',
processcards :'袣邪褉褌芯褔泻邪 锌褉芯褑械褋褋邪',
@@ -629,7 +629,6 @@
delete:'校写邪谢',
outbound:'鍑哄簱',
deviceid:'璁惧ID',
- slot:'携褔械械泻 褋械褌泻谢邪',
enablestatea:'鍚敤鏍囪',
disable:'袨褌泻谢褞褔',
start:'袧邪褔邪谢芯',
@@ -657,7 +656,7 @@
quantitya:'袣芯谢懈褔械褋褌胁芯锛�',
enableid:'浠诲姟ID',
originateslot:'璧峰鏍煎瓙',
- endslot:'鐩爣鏍煎瓙',
+ endoriginateslot:'鐩爣鏍煎瓙',
patternquantity:'鍘熺墖鏁伴噺',
enabletype:'浠诲姟绫诲瀷',
enablestate:'宸ヤ綅鐘舵��',
@@ -675,10 +674,8 @@
taskstatus :'小芯褋褌芯褟薪懈械 蟹邪写邪褔懈',
built :'鏂板缓',
execution :'鎵ц涓�',
- finish :'瀹屾垚',
tasktype :'浠诲姟绫诲瀷',
stocke :'鍏ュ簱',
- outbound :'鍑哄簱',
dispatch :'璋冨害',
inquire :'鏌ヨ',
station :'袪邪斜芯褔械械 屑械褋褌芯',
@@ -740,6 +737,7 @@
totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
+ freethree: '涓夌嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -870,7 +868,7 @@
realpieces: '瀹為檯鐗囨暟',
route: '璺嚎锛�',
croute: '璇烽�夋嫨璺嚎',
- pairQuantity: '鎬婚厤瀵规暟閲忥細',
+ ptotalpairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
schedulingswitch: '璋冨害寮�鍏�',
},
--
Gitblit v1.8.0