From c22029e6f768ea588cf22821bd232c0624b951b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 08:14:54 +0800
Subject: [PATCH] Merge branch 'master' of github.com:luxiaotao1123/rsc-flow

---
 zy-acs-flow/src/i18n/en.js |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index afa0a4d..a065ad7 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -63,6 +63,7 @@
                 result: 'Contacts import complete. Imported %{success} success, with %{error} errors',
             },
             loadMore: 'Load More Data',
+            complete: 'Complete',
         },
         msg: {
             confirm: {
@@ -433,7 +434,8 @@
                 busSts: "bus status",
                 phase: "phase",
                 taskList: "task list",
-                tasksNum: "tasks number",
+                tasksNum: "rest tasks",
+                tasksNumTotal: "total tasks",
             },
             task: {
                 uuid: "uuid",
@@ -456,7 +458,7 @@
                 destCode: "dest code",
                 emptyMk: "empty mk",
                 zpallet: "zpallet",
-                phase: "phase",
+                phase: "ideal path",
                 errDesc: "error",
                 oriDesc: "origin",
                 destDesc: "destination",
@@ -472,7 +474,7 @@
             },
             segment: {
                 uuid: "uuid",
-                groupId: "group no",
+                groupId: "group",
                 travelId: "travel",
                 taskId: "task",
                 agvId: "agv",
@@ -482,6 +484,7 @@
                 posType: "type",
                 backpack: "backpack",
                 state: "state",
+                segDesc: "seg no",
             },
             jam: {
                 uuid: "uuid",
@@ -502,7 +505,7 @@
             },
             action: {
                 uuid: "uuid",
-                groupId: "group no",
+                groupId: "group",
                 busId: "bus",
                 taskId: "task",
                 seqNum: "seq num",

--
Gitblit v1.9.1