From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-flow/src/i18n/en.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index f80d1d6..de01fc6 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -62,9 +62,9 @@
import: {
title: 'Import',
stop: 'Stop import',
- msg: 'Here is a sample CSV file you can use as a template',
+ msg: 'Here is a sample file you can use as a template',
tips: 'The import is running, please do not close this tab.',
- err: 'Failed to import this file, please make sure your provided a valid CSV file.',
+ err: 'Failed to import this file, please make sure your provided a valid file.',
download: 'Download Import Template',
result: 'Contacts import complete. Imported %{success} success, with %{error} errors',
},
@@ -158,6 +158,7 @@
mission: 'Mission',
staReserve: 'Sta Reserve',
lane: 'Lane',
+ integrationRecord: 'Integration',
},
table: {
field: {
@@ -288,11 +289,12 @@
staType: "station type",
code: "code",
offset: "offset",
- height: "height",
- depth: "depth",
+ height: "height(mm)",
+ depth: "depth(mm)",
angle: 'angle',
- inboundWait: 'inbound wait(ms)',
- outboundWait: 'outbound wait(ms)',
+ actDir: 'actuator direction',
+ inboundWait: 'in wait(ms)',
+ outboundWait: 'out wait(ms)',
autoing: "autoing",
loading: "loading",
inEnable: "in enable",
@@ -342,9 +344,9 @@
locNo: "loc No.",
name: "name",
code: "code",
- compDirect: "code direct",
+ compDirect: "actuator direction",
locSts: "loc sts",
- offset: "offset",
+ offset: "height",
row: "row",
bay: "bay",
lev: "lev",
@@ -485,6 +487,7 @@
destLoc: "dest loc",
destCode: "dest code",
emptyMk: "empty mk",
+ uplinkSts: "uplink status",
zpallet: "zpallet",
phase: "ideal path",
errDesc: "error",
@@ -603,6 +606,22 @@
entryAngle: "entry angle",
maximum: "maximum",
},
+ integrationRecord: {
+ uuid: "uuid",
+ namespace: "namespace",
+ url: "url",
+ appkey: "appkey",
+ caller: "caller",
+ direction: "direction",
+ timestamp: "timestamp",
+ clientIp: "clientIp",
+ request: "request",
+ response: "response",
+ err: "error",
+ result: "result",
+ costMs: "costMs",
+ },
+
}
},
page: {
@@ -669,6 +688,13 @@
},
levOffset: 'lev offset',
bottomOffset: 'bottom offset',
+ enums: {
+ compDirect: {
+ left: 'Left',
+ right: 'Right',
+ forward: 'Forward',
+ },
+ },
},
sta: {
depthHint: 'Set depth to 0 to keep the default value.',
@@ -720,6 +746,18 @@
reposition: 'clear path reposition',
}
},
+ task: {
+ enums: {
+ uplinkSts: {
+ NONE: 'Unknown',
+ PENDING: 'Pending',
+ SENDING: 'Uploading',
+ SUCCESS: 'Success',
+ FAILED: 'Failed',
+ SKIPPED: 'Skipped',
+ },
+ },
+ },
segment: {
enums: {
state: {
--
Gitblit v1.9.1