From 5292a401bc26ad177ff5005787429ce036e6457f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 13:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 9aa0ca6..c8a4644 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -559,7 +559,6 @@
hollownumber: '涓┖鎬绘暟閲�',
hollowEngineer: '涓┖宸ョ▼',
hollowarea: '涓┖鎬婚潰绉�',
- hollowtotal: '涓┖鎬绘椂闂�',
engineerId: '宸ョ▼鍙�',
totalnumber: '鎬绘暟閲�',
tatalarea: '鎬婚潰绉�',
@@ -809,6 +808,10 @@
finegrinding: '绮剧（',
},
hellow: {
+ taskAlreadyClaimed: '璇ヤ换鍔″凡棰嗗彇锛屼笉鍙噸澶嶆搷浣�',
+ claimed: '宸查鍙�',
+ claimFailed: '棰嗗彇浠诲姟澶辫触',
+ claimedTasksCleared: '宸查鍙栦换鍔＄姸鎬佸凡娓呴櫎',
content:'鍐呭',
idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
@@ -986,5 +989,38 @@
pwidth: '璇疯緭鍏ュ搴�',
pheight: '璇疯緭鍏ラ珮搴�',
upnumber: '涓婄墖鏁伴噺',
- }
+ },
+ scheduling:{
+ cuttingCount: '鍒囧壊',
+ edgingCount: '纾ㄨ竟',
+ temperingCount: '閽㈠寲',
+ insulatingCount: '涓┖',
+ completed:"宸叉帓浜�",
+ completedCount: '瀹屾垚鏁伴噺',
+ unfinished:'寰呮帓浜�',
+ serial: '搴忓彿',
+ projectNo: '宸ョ▼ID',
+ thickness: '鍘氬害(mm)',
+ glassType: '鐜荤拑绫诲瀷',
+ coatingType: '鑶滅郴',
+ layerCount: '灞傛暟',
+ height: '闀�(mm)',
+ width: '瀹�(mm)',
+ state: '鐘舵��',
+ glassCount: '鏁伴噺',
+ operate: '鎿嶄綔',
+ totalCount: '鎬荤墖鏁�',
+ totalArea: '鎬婚潰绉�(銕�)',
+ remove: '鍘婚櫎',
+ top: '缃《',
+ order: '鍑虹墖椤哄簭',
+ flowCardId: '娴佺▼鍗″彿',
+ add: '娣诲姞',
+ cancelled: '宸插彇娑�',
+ saveFailed: '淇濆瓨鎺掍骇淇℃伅澶辫触',
+ retryLater: '璇风◢鍚庨噸璇�',
+ saveSuccess: '淇濆瓨鎴愬姛',
+ totalFireCount: '鎬荤倝鏁�',
+ fullFireCount: '婊＄倝鏁�',
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0