Merge pull request #2690 from jumpserver/pr@dev@perf_task_route

perf: 迁移到了系统设置中

src/i18n/langs/en.json

@@ -1411,7 +1411,7 @@
     "CASSetting": "CAS setting",
     "CAS": "CAS",
     "OIDC": "OIDC",
-    "Other": "More...",
+    "Other": "Other",
     "Auth": "Auth",
     "SyncSetting": "Sync setting",
     "Advanced": "Advanced",
@@ -1592,7 +1592,7 @@
     "AppEndpoint": "Application access address",
     "authCASAttrMap": "User Attribute Mapping",
     "SignaturesAndTemplates": "Signatures and Templates",
-    "SystemTools": "System Tool",
+    "SystemTools": "Tools",
     "testTools": "Test",
     "basicTools": "Basic tool"
   },
@@ -1994,7 +1994,7 @@
     "Import": "Import",
     "ImportLicense": "Import license",
     "ImportLicenseTip": "Please Import License",
-    "InterfaceSettings": "Interface Setting",
+    "InterfaceSettings": "Interface",
     "License": "License",
     "LicenseDetail": "License detail",
     "ComponentMonitor": "System Monitor",

src/i18n/langs/zh.json

@@ -1242,7 +1242,7 @@
     "SystemUserUpdate": "更新系统用户",
     "AssetUserList": "资产用户",
     "TaskDetail": "任务详情",
-    "TaskList": "任务列表",
+    "TaskList": "系统任务",
     "TaskMonitor": "任务监控",
     "Terminal": "终端管理",
     "TicketDetail": "工单详情",

src/router/console/index.js

@@ -6,7 +6,6 @@ import store from '@/store'
 import UsersRoute from './users'
 import AssetsRoute from './assets'
 import PermsRoute from './perms'
-import TaskRoutes from './tasks'
 import AccountRoutes from './accounts'
 
 export default {
@@ -74,16 +73,6 @@ export default {
         icon: 'permission'
       },
       children: PermsRoute
-    },
-    {
-      path: '/console/tasks',
-      component: empty,
-      name: 'TaskCenter',
-      meta: {
-        title: i18n.t('route.TaskCenter'),
-        icon: 'tasks'
-      },
-      children: TaskRoutes
     }
   ]
 }

src/router/console/tasks.js

@@ -1,44 +0,0 @@
-import i18n from '@/i18n/i18n'
-import { BASE_URL } from '@/utils/common'
-import empty from '@/layout/empty'
-
-export default [
-  {
-    path: 'tasks',
-    component: empty,
-    meta: {
-      title: i18n.t('route.TaskList'),
-      permissions: ['ops.view_celerytask']
-    },
-    children: [
-      {
-        path: '',
-        name: 'TaskList',
-        component: () => import('@/views/tasks/TaskList'),
-        meta: {
-          title: i18n.t('route.TaskList'),
-          permissions: ['ops.view_celerytask']
-        }
-      },
-      {
-        path: ':id',
-        component: () => import('@/views/tasks/TaskDetail'),
-        name: 'TaskDetail',
-        hidden: true,
-        meta: {
-          title: i18n.t('route.TaskDetail'),
-          permissions: ['ops.view_celerytask']
-        }
-      }
-    ]
-  },
-  {
-    path: `${BASE_URL}/core/flower/?_=${Date.now()}`,
-    name: 'TaskMonitor',
-    // component: () => window.open(`/core/flower?_=${Date.now()}`),
-    meta: {
-      title: i18n.t('route.TaskMonitor'),
-      permissions: ['ops.view_taskmonitor']
-    }
-  }
-]

src/router/settings/index.js

@@ -352,16 +352,7 @@ export default {
         }
       ]
     },
-    {
+
-      path: '/settings/other',
-      name: 'Other',
-      component: () => import('@/views/settings/Other'),
-      meta: {
-        title: i18n.t('setting.Other'),
-        icon: 'other',
-        permissions: ['settings.change_other']
-      }
-    },
     {
       path: '/settings/tools',
       name: 'Tools',
@@ -372,6 +363,47 @@ export default {
         permissions: ['settings.view_setting']
       }
     },
+    {
+      path: '/settings/tasks',
+      component: empty,
+      meta: {
+        title: i18n.t('route.TaskList'),
+        icon: 'tasks',
+        permissions: ['ops.view_celerytask']
+      },
+      children: [
+        {
+          path: '',
+          name: 'TaskList',
+          component: () => import('@/views/tasks/TaskList'),
+          meta: {
+            title: i18n.t('route.TaskList'),
+            permissions: ['ops.view_celerytask']
+          }
+        },
+        {
+          path: ':id',
+          component: () => import('@/views/tasks/TaskDetail'),
+          name: 'TaskDetail',
+          hidden: true,
+          meta: {
+            title: i18n.t('route.TaskDetail'),
+            permissions: ['ops.view_celerytask'],
+            activeMenu: '/settings/tasks'
+          }
+        }
+      ]
+    },
+    {
+      path: '/settings/other',
+      name: 'Other',
+      component: () => import('@/views/settings/Other'),
+      meta: {
+        title: i18n.t('setting.Other'),
+        icon: 'other',
+        permissions: ['settings.change_other']
+      }
+    },
     {
       path: '/settings/license',
       name: 'License',

src/views/settings/Other.vue

@@ -10,8 +10,8 @@
 </template>
 
 <script>
-import { IBox, CronTab } from '@/components'
+import { CronTab, IBox } from '@/components'
-import { Page, GenericCreateUpdateForm } from '@/layout/components'
+import { GenericCreateUpdateForm, Page } from '@/layout/components'
 
 export default {
   name: 'Senior',

src/views/tasks/TaskList.vue

@@ -4,7 +4,8 @@
 
 <script type="text/jsx">
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/TableFormatters'
+import { ChoicesFormatter, DetailFormatter } from '@/components/TableFormatters'
+import { BASE_URL } from '@/utils/common'
 
 export default {
   components: {
@@ -23,7 +24,7 @@ export default {
             formatterArgs: {
               can: this.$hasPerm('ops.view_celerytask'),
               router: 'TaskDetail',
-              getTitle({ col, row, cellValue }) {
+              getTitle({ row, cellValue }) {
                 if (row.meta && row.meta.comment) {
                   return row.meta.comment
                 }
@@ -69,22 +70,44 @@ export default {
             label: this.$t('ops.State'),
             width: '60px',
             align: 'center',
-            formatter: (row) => {
+            formatter: ChoicesFormatter,
-              switch (row.state) {
+            formatterArgs: {
-                case 'green':
+              getIcon() {
-                  return <el-tooltip effect={'dark'} content={this.$tc('ops.StatusGreen')} placement={'bottom'}><i Class='fa  fa-circle-o text-primary'/></el-tooltip>
+                return 'fa-circle-o'
-                case 'yellow':
+              },
-                  return <el-tooltip effect={'dark'} content={this.$tc('ops.StatusYellow')} placement={'bottom'}><i Class='fa  fa-circle-o text-warning'/></el-tooltip>
+              classChoices: {
-                case 'red':
+                green: 'text-primary',
-                  return <el-tooltip effect={'dark'} content={this.$tc('ops.StatusRed')} placement={'bottom'}><i Class='fa  fa-circle-o text-danger'/></el-tooltip>
+                yellow: 'text-warning',
+                red: 'text-danger'
+              },
+              showText: false,
+              hasTips: true,
+              getTips: ({ cellValue }) => {
+                switch (cellValue) {
+                  case 'green':
+                    return this.$t('ops.StatusGreen')
+                  case 'yellow':
+                    return this.$t('ops.StatusYellow')
+                  default:
+                    return this.$t('ops.StatusRed')
+                }
               }
             }
           }
         }
       },
       headerActions: {
-        hasRightActions: false,
+        hasCreate: false,
-        hasLeftActions: false
+        hasMoreActions: false,
+        extraActions: [
+          {
+            title: this.$t('route.TaskMonitor'),
+            type: 'primary',
+            callback: () => {
+              window.open(`${BASE_URL}/core/flower/?_=${Date.now()}`,)
+            }
+          }
+        ]
       }
     }
   },