From 59548ecdddf437e77662e202d278f214db3aa4ad Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 三月 2025 09:28:43 +0800
Subject: [PATCH] 合并代码
---
UI-Project/src/lang/py.js | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index a464e35..8b85395 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -34,7 +34,8 @@
quit: "袙褘褏芯写",
},
basicData: {
- deletemessage: '校写邪谢懈褌褜 褝褌褍 懈薪褎芯褉屑邪褑懈褞 懈谢懈 薪械褌?',
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting: '袦邪褕懈薪邪 谢邪蟹械褉薪芯泄 屑邪褉泻懈褉芯胁泻懈 谐芯褌芯胁邪锛�',
cuttingmachine: '袦邪褕懈薪邪 写谢褟 褉械蟹泻懈 谐芯褌芯胁邪锛�',
machine: '小芯褋褌芯褟薪懈械 褋褌邪薪芯泻 蟹邪谐褉褍蟹泻懈 胁 褉械卸懈屑械 芯薪谢邪泄薪锛�',
@@ -94,6 +95,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
@@ -127,6 +131,20 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ successfullyprocessed:'浠诲姟鎴愬姛澶勭悊',
+ psuccessfullyprocessed:'鏄惁杩涜浠诲姟鎴愬姛澶勭悊锛�',
+ taskfailure:'浠诲姟澶辫触澶勭悊',
+ ptaskfailure:'鏄惁杩涜浠诲姟澶辫触澶勭悊锛�',
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害%',
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
partask:'浠诲姟閲嶇疆',
@@ -544,8 +562,9 @@
broke :'袩芯胁褉械卸写械薪懈械',
takeout :'袙蟹褟褌褜',
dreportwork :'鏈姤宸�',
- pendingwork :'寰呮姤宸�',
+ pendingwork :'宸茬幇琛�',
reportwork :'宸叉姤宸�',
+ reportworked :'宸插悓姝�',
incise :'鍒囧壊',
edging :'纾ㄨ竟',
steel :'袟邪泻邪谢泻邪',
@@ -579,6 +598,7 @@
premark :'璇疯緭鍏ュ娉�',
},
film:{
+ fail:'澶辫触',
mes:'鍘熺墖浠撳偍璇︽儏',
warehousing:'鍘熺墖鍏ュ簱',
pwarehousing:'鍏ュ簱璇锋眰',
@@ -676,6 +696,8 @@
finegrinding: '绮剧（',
},
hellow: {
+ freeone: '涓�绾跨┖闂茬姸鎬侊細',
+ freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
casFourb: '姘斾綋4锛�',
casFoura: '璇烽�夋嫨姘斾綋4',
@@ -702,17 +724,44 @@
frameTwo: '闂撮殧鏉�2',
frameTwob: '闂撮殧鏉�2锛�',
frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
- intervalFrameHeight: '闂撮殧妗嗛珮搴�',
- intervalFrameHeighta: '璇疯緭鍏ラ棿闅旀楂樺害',
- intervalFrameHeightb: '闂撮殧妗嗛珮搴︼細',
- intervalFrameType: '闂撮殧妗嗙被鍨�',
- intervalFrameTypec: '璇烽�夋嫨闂撮殧妗嗙被鍨�',
- intervalFrameTyped: '闂撮殧妗嗙被鍨嬶細',
+ intervalFrameHeightOne: '闂撮殧妗嗛珮搴�1',
+ intervalFrameHeightTwo: '闂撮殧妗嗛珮搴�2',
+ intervalFrameHeightThree: '闂撮殧妗嗛珮搴�3',
+ intervalFrameHeightFour: '闂撮殧妗嗛珮搴�4',
+ intervalFrameHeightaOne: '璇疯緭鍏ラ棿闅旀楂樺害1',
+ intervalFrameHeightaTwo: '璇疯緭鍏ラ棿闅旀楂樺害2',
+ intervalFrameHeightaThree: '璇疯緭鍏ラ棿闅旀楂樺害3',
+ intervalFrameHeightaFour: '璇疯緭鍏ラ棿闅旀楂樺害4',
+ intervalFrameHeightbOne: '闂撮殧妗嗛珮搴�1锛�',
+ intervalFrameHeightbTwo: '闂撮殧妗嗛珮搴�2锛�',
+ intervalFrameHeightbThree: '闂撮殧妗嗛珮搴�3锛�',
+ intervalFrameHeightbFour: '闂撮殧妗嗛珮搴�4锛�',
+ intervalFrameTypeOne: '闂撮殧妗嗙被鍨�1',
+ intervalFrameTypeTwo: '闂撮殧妗嗙被鍨�2',
+ intervalFrameTypeThree: '闂撮殧妗嗙被鍨�3',
+ intervalFrameTypeFour: '闂撮殧妗嗙被鍨�4',
+ intervalFrameTypecOne: '璇烽�夋嫨闂撮殧妗嗙被鍨�1',
+ intervalFrameTypecTwo: '璇烽�夋嫨闂撮殧妗嗙被鍨�2',
+ intervalFrameTypecThree: '璇烽�夋嫨闂撮殧妗嗙被鍨�3',
+ intervalFrameTypecFour: '璇烽�夋嫨闂撮殧妗嗙被鍨�4',
+ intervalFrameTypedOne: '闂撮殧妗嗙被鍨�1锛�',
+ intervalFrameTypedTwo: '闂撮殧妗嗙被鍨�2锛�',
+ intervalFrameTypedThree: '闂撮殧妗嗙被鍨�3锛�',
+ intervalFrameTypedFour: '闂撮殧妗嗙被鍨�4锛�',
intervalFrameTypea: 'tps鑳�',
intervalFrameTypeb: '閾濋棿闅旀潯',
- intervalFrameWidth: '闂撮殧妗嗗搴�',
- intervalFrameWidtha: '璇疯緭鍏ラ棿闅旀瀹藉害',
- intervalFrameWidthb: '闂撮殧妗嗗搴︼細',
+ intervalFrameWidthOne: '闂撮殧妗嗗搴�1',
+ intervalFrameWidthTwo: '闂撮殧妗嗗搴�2',
+ intervalFrameWidthThree: '闂撮殧妗嗗搴�3',
+ intervalFrameWidthFour: '闂撮殧妗嗗搴�4',
+ intervalFrameWidthaOne: '璇疯緭鍏ラ棿闅旀瀹藉害1',
+ intervalFrameWidthaTwo: '璇疯緭鍏ラ棿闅旀瀹藉害2',
+ intervalFrameWidthaThree: '璇疯緭鍏ラ棿闅旀瀹藉害3',
+ intervalFrameWidthaFour: '璇疯緭鍏ラ棿闅旀瀹藉害4',
+ intervalFrameWidthbOne: '闂撮殧妗嗗搴�1锛�',
+ intervalFrameWidthbTwo: '闂撮殧妗嗗搴�2锛�',
+ intervalFrameWidthbThree: '闂撮殧妗嗗搴�3锛�',
+ intervalFrameWidthbFour: '闂撮殧妗嗗搴�4锛�',
sealInsert: '瀵嗗皝宓屽叆',
sealInsertb: '瀵嗗皝宓屽叆锛�',
sealInserta: '璇疯緭鍏ュ瘑灏佸祵鍏�',
--
Gitblit v1.8.0