Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/box.js

@@ -257,6 +257,7 @@ export function downloadAgentListFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadAgentListFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -266,6 +267,7 @@ export function downloadSoncapFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadSoncapFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -275,6 +277,7 @@ export function downloadCustomFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadCustomFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -284,6 +287,7 @@ export function downloadLoadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadLoadGoodsList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -294,6 +298,7 @@ export function downloadPreloadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadPreloadGoodsList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -304,6 +309,7 @@ export function downloadReceivableList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadReceivableList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -314,6 +320,7 @@ export function downloadLadingCopy(params) {
   return request({
     url: "/ecw/box-lading-copy/downloadLadingCopy",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -334,4 +341,4 @@ export function updateUrl(data) {
     method: "put",
     data,
   });
-}
\ No newline at end of file
+}

src/i18n/languages/en_US.json

@@ -204,8 +204,8 @@
     "未来计划方数": "CBM of future plans",
     "未来实际方数": " Actual CBM in the future",
     "创建人": "founder",
-    "未来": "future",
-    "天货柜数": "Number of containers per day",
+    "未来": "Number of containers in the next",
+    "天货柜数": "days",
     "未来{futureNumber}天计划方数": "Planned cbm in the future {futureNumber} days",
     "未来{futureNumber}天实际方数": "Actual cbm  in the future {futureNumber} days",
     "添加预定舱计划": "Add booking plan",