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/en.js | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 082291b..f80d1d6 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -92,7 +92,8 @@
earlier: 'Earlier...',
},
validate: {
- pwdMisMatch: 'The password confirmation is not the same as the password.'
+ pwdMisMatch: 'The password confirmation is not the same as the password.',
+ gtZero: 'The value must be greater than 0.',
},
settings: {
base: 'Base',
@@ -287,7 +288,11 @@
staType: "station type",
code: "code",
offset: "offset",
+ height: "height",
+ depth: "depth",
angle: 'angle',
+ inboundWait: 'inbound wait(ms)',
+ outboundWait: 'outbound wait(ms)',
autoing: "autoing",
loading: "loading",
inEnable: "in enable",
@@ -493,6 +498,8 @@
currSeg: "curr seg",
taskContent: "tasks",
taskIds: "task list",
+ rollerWaiting: 'roller waiting',
+ rollerWaitingCode: 'waiting code',
state: "state",
},
segment: {
@@ -664,6 +671,7 @@
bottomOffset: 'bottom offset',
},
sta: {
+ depthHint: 'Set depth to 0 to keep the default value.',
enums: {
type: {
in: 'UNLOAD',
@@ -722,6 +730,14 @@
},
},
},
+ travel: {
+ enums: {
+ state: {
+ running: 'RUNNING',
+ finish: 'FINISH',
+ },
+ },
+ },
jam: {
enums: {
state: {
--
Gitblit v1.9.1