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/zh.js | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 914a9ce..1f421e4 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -62,9 +62,9 @@
import: {
title: '瀵煎叆',
stop: '鍋滄瀵煎叆',
- msg: '杩欐槸涓�涓彲浠ョ敤浣滄ā鏉跨殑绀轰緥 CSV 鏂囦欢',
+ msg: '杩欐槸涓�涓彲浠ョ敤浣滄ā鏉跨殑绀轰緥鏂囦欢',
tips: '姝ｅ湪瀵煎叆涓紝璇蜂笉瑕佸叧闂绐楀彛',
- err: '鏃犳硶瀵煎叆姝ゆ枃浠讹紝璇风‘淇濇偍鎻愪緵浜嗘湁鏁堢殑 CSV 鏂囦欢',
+ err: '鏃犳硶瀵煎叆姝ゆ枃浠讹紝璇风‘淇濇偍鎻愪緵浜嗘湁鏁堢殑鏂囦欢',
download: '涓嬭浇瀵煎叆妯℃澘',
result: '瀵煎叆瀹屾垚銆傚凡瀵煎叆 %{success} 鎴愬姛, 鍜� %{error} 澶辫触',
},
@@ -158,6 +158,7 @@
mission: '鎵ц',
staReserve: '绔欑偣棰勭害',
lane: '宸烽亾绠＄悊',
+ integrationRecord: '闆嗘垚浜や簰',
},
table: {
field: {
@@ -288,11 +289,12 @@
staType: "绔欑偣绫诲瀷",
code: "鍦伴潰鐮�",
offset: "鍋忕Щ閲�",
- height: "浣滀笟楂樺害",
- depth: "浣滀笟娣卞害",
- angle: '浣滀笟瑙掑害',
- inboundWait: '鍏ュ簱绛夊緟(姣)',
- outboundWait: '鍑哄簱绛夊緟(姣)',
+ height: "浣滀笟楂樺害(mm)",
+ depth: "浣滀笟娣卞害(mm)",
+ angle: '杞︿綋瑙掑害(掳)',
+ actDir: '璐у弶鏂瑰悜',
+ inboundWait: '鍏ュ簱绛�(ms)',
+ outboundWait: '鍑哄簱绛�(ms)',
autoing: "鑷姩",
loading: "杞借揣",
inEnable: "鍙叆",
@@ -342,9 +344,9 @@
locNo: "搴撲綅鍙�",
name: "鍚嶇О",
code: "鍦伴潰鐮�",
- compDirect: "鐮佹柟鍚�",
+ compDirect: "璐у弶鏂瑰悜",
locSts: "搴撲綅鐘舵��",
- offset: "鍋忕Щ閲�",
+ offset: "楂樺害",
row: "鎺�",
bay: "鍒�",
lev: "灞�",
@@ -485,6 +487,7 @@
destLoc: "鐩爣搴撲綅",
destCode: "鐩爣鍦伴潰鐮�",
emptyMk: "绌烘枡绠�",
+ uplinkSts: "涓婅鐘舵��",
zpallet: "鏂欑鐮�",
phase: "鐞嗘兂璺緞",
errDesc: "寮傚父鎻忚堪",
@@ -603,6 +606,22 @@
entryAngle: "杞︿綋瑙掑害",
maximum: "鎵胯浇閲�",
},
+ integrationRecord: {
+ uuid: "缂栧彿",
+ namespace: "鍛藉悕绌洪棿",
+ url: "鎺ュ彛鍦板潃",
+ appkey: "瀵嗛挜",
+ caller: "璋冪敤鏂�",
+ direction: "鏂瑰悜",
+ timestamp: "鏃堕棿鎴�",
+ clientIp: "瀹㈡埛绔疘P",
+ request: "璇锋眰鍐呭",
+ response: "鍝嶅簲鍐呭",
+ err: "寮傚父",
+ result: "璇锋眰缁撴灉",
+ costMs: "鑰楁椂(姣)",
+ },
+
}
},
page: {
@@ -669,6 +688,13 @@
},
levOffset: '姣忓眰楂樺害',
bottomOffset: '搴曢儴鍋忕Щ閲�',
+ enums: {
+ compDirect: {
+ left: '宸�',
+ right: '鍙�',
+ forward: '鍓�',
+ },
+ },
},
sta: {
depthHint: '娣卞害璁剧疆涓� 0 琛ㄧず娌跨敤榛樿鍊笺��',
@@ -720,6 +746,18 @@
reposition: '娓呴櫎璺緞閲嶆柊瀹氫綅',
}
},
+ task: {
+ enums: {
+ uplinkSts: {
+ NONE: '鏈煡',
+ PENDING: '寰呬笂鎶�',
+ SENDING: '涓婃姤涓�',
+ SUCCESS: '鎴愬姛',
+ FAILED: '澶辫触',
+ SKIPPED: '璺宠繃',
+ },
+ },
+ },
segment: {
enums: {
state: {
--
Gitblit v1.9.1