Merge branch 'dev' of github.com:jumpserver/lina into dev

src/i18n/langs/cn.json

@@ -452,7 +452,7 @@
     "WebFTP": "文件管理",
     "WebTerminal": "Web终端",
     "BatchCommandLog": "批量命令",
-    "": ""
+    "TaskMonitor": "任务监控"
   },
   "sessions": {
     "StorageConfiguration": "存储配置",
@@ -622,7 +622,9 @@
     "consult": "咨询",
     "ImportLicense": "导入许可证",
     "AssetCount": "资产数量",
-    "ImportLicenseTip": "请导入许可证"
+    "ImportLicenseTip": "请导入许可证",
+    "all": "全部",
+    "auto": "自动"
   },
   "settings": {
     "setting": ""
@@ -765,8 +767,8 @@
       "DateJoined": "创建日期",
       "DateUpdated": "更新日期",
       "ManualExecutePlan": "手动执行计划",
-      "addAsset": "添加资产",
+      "AddAsset": "添加资产",
-      "addNode": "添加节点",
+      "AddNode": "添加节点",
       "Result": "结果",
       "TimeDelta": "运行时间",
       "DateStart": "开始日期",

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",
@@ -614,8 +615,8 @@
     "AssetCount": "Asset count",
     "ImportLicenseTip": "Please Import License",
     "ApiKeyList": "Api key list",
-    "DateCreated": "",
+    "all": "All",
-    "Create": ""
+    "auto": "Auto"
   },
   "settings": {
     "setting": ""

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') }
   }
 ]

src/views/settings/Terminal.vue

@@ -71,8 +71,8 @@ export default {
           label: this.$t('setting.terminalAssetListPageSize'),
           type: 'select',
           options: [
-            { label: 'All', value: 'all' },
+            { label: this.$t('setting.all'), value: 'all' },
-            { label: 'Auto', value: 'auto' },
+            { label: this.$t('setting.auto'), value: 'auto' },
             { label: '10', value: '10' },
             { label: '15', value: '15' },
             { label: '25', value: '25' },

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>