From a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 一月 2026 12:54:15 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-flow/src/i18n/zh.js | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 32006ac..914a9ce 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -92,7 +92,8 @@
earlier: '鏇存棭...',
},
validate: {
- pwdMisMatch: '瀵嗙爜涓嶄竴鑷�'
+ pwdMisMatch: '瀵嗙爜涓嶄竴鑷�',
+ gtZero: '璇疯緭鍏ュぇ浜�0鐨勬暟鍊�',
},
settings: {
base: '鍩烘湰璁剧疆',
@@ -287,7 +288,11 @@
staType: "绔欑偣绫诲瀷",
code: "鍦伴潰鐮�",
offset: "鍋忕Щ閲�",
+ height: "浣滀笟楂樺害",
+ depth: "浣滀笟娣卞害",
angle: '浣滀笟瑙掑害',
+ inboundWait: '鍏ュ簱绛夊緟(姣)',
+ outboundWait: '鍑哄簱绛夊緟(姣)',
autoing: "鑷姩",
loading: "杞借揣",
inEnable: "鍙叆",
@@ -493,6 +498,8 @@
currSeg: "褰撳墠浣滀笟",
taskContent: "浠诲姟鍐呭",
taskIds: "浠诲姟鍒楄〃",
+ rollerWaiting: '婊氱瓛绾跨瓑寰�',
+ rollerWaitingCode: '绛夊緟浣嶅湴鐮�',
state: "鐘舵��",
},
segment: {
@@ -664,6 +671,7 @@
bottomOffset: '搴曢儴鍋忕Щ閲�',
},
sta: {
+ depthHint: '娣卞害璁剧疆涓� 0 琛ㄧず娌跨敤榛樿鍊笺��',
enums: {
type: {
in: '鏀捐揣',
@@ -722,6 +730,14 @@
},
},
},
+ travel: {
+ enums: {
+ state: {
+ running: '姝ｅ湪杩愯',
+ finish: '宸插畬鎴�',
+ },
+ },
+ },
jam: {
enums: {
state: {
--
Gitblit v1.9.1