From 9d87be8744c750777e46843972a0eabef0a18068 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 4 Jun 2020 15:10:11 +0800
Subject: [PATCH 1/3] add task monitor

---
 src/i18n/langs/cn.json | 2 +-
 src/i18n/langs/en.json | 3 ++-
 src/router/ops.js      | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index f2dfc443c..3980f6507 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -452,7 +452,7 @@
     "WebFTP": "文件管理",
     "WebTerminal": "Web终端",
     "BatchCommandLog": "批量命令",
-    "": ""
+    "TaskMonitor": "任务监控"
   },
   "sessions": {
     "StorageConfiguration": "存储配置",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ce7772662..8d7294e64 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -448,7 +448,8 @@
     "Users": "Users",
     "WebFTP": "WebFTP",
     "WebTerminal": "Web terminal",
-    "BatchCommandLog": "Batch command log"
+    "BatchCommandLog": "Batch command log",
+    "TaskMonitor": "Task monitor"
   },
   "sessions": {
     "StorageConfiguration": "Storage configuration",
diff --git a/src/router/ops.js b/src/router/ops.js
index d6560ec64..faeb27e8a 100644
--- a/src/router/ops.js
+++ b/src/router/ops.js
@@ -40,5 +40,11 @@ export default [
     name: 'CeleryTaskLog',
     hidden: true,
     meta: { title: i18n.t('route.CeleryTaskLog') }
+  },
+  {
+    path: 'task/monitor',
+    name: 'TaskMonitor',
+    component: () => window.open(`/core/flower?_=${Date.now()}`),
+    meta: { title: i18n.t('route.TaskMonitor') }
   }
 ]

From f09e34a02f549c9591f40ae59734042a395ebc19 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 4 Jun 2020 15:33:45 +0800
Subject: [PATCH 2/3] add terminal en cn

---
 src/i18n/langs/cn.json          | 4 +++-
 src/i18n/langs/en.json          | 4 ++--
 src/views/settings/Terminal.vue | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 3980f6507..f66695df2 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -622,7 +622,9 @@
     "consult": "咨询",
     "ImportLicense": "导入许可证",
     "AssetCount": "资产数量",
-    "ImportLicenseTip": "请导入许可证"
+    "ImportLicenseTip": "请导入许可证",
+    "all": "全部",
+    "auto": "自动"
   },
   "settings": {
     "setting": ""
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 8d7294e64..ef71c1ab6 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -615,8 +615,8 @@
     "AssetCount": "Asset count",
     "ImportLicenseTip": "Please Import License",
     "ApiKeyList": "Api key list",
-    "DateCreated": "",
-    "Create": ""
+    "all": "All",
+    "auto": "Auto"
   },
   "settings": {
     "setting": ""
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index ba971cb0f..a81fd68ba 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -71,8 +71,8 @@ export default {
           label: this.$t('setting.terminalAssetListPageSize'),
           type: 'select',
           options: [
-            { label: 'All', value: 'all' },
-            { label: 'Auto', value: 'auto' },
+            { label: this.$t('setting.all'), value: 'all' },
+            { label: this.$t('setting.auto'), value: 'auto' },
             { label: '10', value: '10' },
             { label: '15', value: '15' },
             { label: '25', value: '25' },

From aebc4856ee69165dc72edc17e6f7b9b7ba64c772 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 4 Jun 2020 15:55:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E8=AE=A1=E5=88=92=E8=B5=84=E4=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                                        | 4 ++--
 .../ChangeAuthPlanAsset/AssetRelationCard.vue                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 3980f6507..62f09c86c 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -765,8 +765,8 @@
       "DateJoined": "创建日期",
       "DateUpdated": "更新日期",
       "ManualExecutePlan": "手动执行计划",
-      "addAsset": "添加资产",
-      "addNode": "添加节点",
+      "AddAsset": "添加资产",
+      "AddNode": "添加节点",
       "Result": "结果",
       "TimeDelta": "运行时间",
       "DateStart": "开始日期",
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/AssetRelationCard.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/AssetRelationCard.vue
index 8dcbbaccc..acad4c76a 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/AssetRelationCard.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/AssetRelationCard.vue
@@ -3,7 +3,7 @@
     <table style="width: 100%">
       <tr>
         <td colspan="2">
-          <AssetSelect ref="assetSelect" @getAsset="getAsset" />
+          <AssetSelect ref="assetSelect" @change="getAsset" />
         </td>
       </tr>
       <tr>