From 5b1bc4478c02b4a36b7824721aa82b74acce5af3 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Tue, 29 Nov 2022 19:43:26 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=87=8D=E6=96=B0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=92=8C=E4=BA=A4=E4=BA=92=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/zh.json | 8 +- src/router/workbench/index.js | 90 ++++++++------ src/views/ops/Adhoc/index.vue | 51 -------- src/views/ops/Executions/index.vue | 114 ++++++++++++++++++ src/views/ops/Job/JobUpdateCreate.vue | 8 +- .../InstantAdhoc.vue => Job/QuickJob.vue} | 104 ++++++++-------- src/views/ops/Job/index.vue | 16 ++- src/views/ops/Playbook/HIstory.vue | 12 -- .../MyAdhoc.vue => ScriptManage/Adhoc.vue} | 0 .../Adhoc}/AdhocDetail/AdhocDetail.vue | 0 .../Adhoc}/AdhocDetail/index.vue | 2 +- .../Adhoc}/AdhocUpdateCreate.vue | 0 .../Playbook.vue} | 2 +- .../Playbook/PlaybookUpdateCreate.vue | 0 .../Playbook/UploadDialog.vue | 0 .../ops/{Playbook => ScriptManage}/index.vue | 18 +-- 16 files changed, 247 insertions(+), 178 deletions(-) delete mode 100644 src/views/ops/Adhoc/index.vue create mode 100644 src/views/ops/Executions/index.vue rename src/views/ops/{Adhoc/InstantAdhoc.vue => Job/QuickJob.vue} (67%) delete mode 100644 src/views/ops/Playbook/HIstory.vue rename src/views/ops/{Adhoc/MyAdhoc.vue => ScriptManage/Adhoc.vue} (100%) rename src/views/ops/{Adhoc/my => ScriptManage/Adhoc}/AdhocDetail/AdhocDetail.vue (100%) rename src/views/ops/{Adhoc/my => ScriptManage/Adhoc}/AdhocDetail/index.vue (91%) rename src/views/ops/{Adhoc/my => ScriptManage/Adhoc}/AdhocUpdateCreate.vue (100%) rename src/views/ops/{Playbook/PlaybookList.vue => ScriptManage/Playbook.vue} (95%) rename src/views/ops/{ => ScriptManage}/Playbook/PlaybookUpdateCreate.vue (100%) rename src/views/ops/{ => ScriptManage}/Playbook/UploadDialog.vue (100%) rename src/views/ops/{Playbook => ScriptManage}/index.vue (58%) diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index a935799de..94f6c6464 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -691,8 +691,10 @@ "privilegeOnly": "仅选择特权账号", "privilegeFirst": "优先选择特权账号", "skip": "忽略当前资产", + "QuickJob": "快捷作业", "instantAdhoc": "即时命令", - "myAdhoc": "我的命令", + "AdhocManage": "命令管理", + "PlaybookManage": "Playbook管理", "history": "历史记录", "createAdhoc": "创建命令", "AdhocDetail": "命令详情", @@ -840,6 +842,8 @@ "SessionList": "会话记录", "BatchCommand": "批量命令", "BatchScript": "批量脚本", + "Executions": "执行历史", + "ScriptManage": "脚本管理", "TicketsTodo": "待办工单", "TicketsDone": "已办工单", "TicketsNew": "提交工单", @@ -896,7 +900,7 @@ "GatewayUpdate": "更新网关", "TaskCenter": "任务中心", "JobCenter": "作业中心", - "JobList": "作业列表", + "JobList": "作业管理", "JobCreate": "创建作业", "JobUpdate": "更新作业", "JobDetail": "作业详情", diff --git a/src/router/workbench/index.js b/src/router/workbench/index.js index 4cde26cfd..4d9408cee 100644 --- a/src/router/workbench/index.js +++ b/src/router/workbench/index.js @@ -89,6 +89,17 @@ export default { permissions: [] }, children: [ + { + path: 'quick-job', + name: 'QuickJob', + hidden: true, + component: () => import('@/views/ops/Job/QuickJob'), + meta: { + title: i18n.t('ops.QuickJob'), + permissions: [], + activeMenu: '/workbench/ops/job' + } + }, { path: 'job', name: 'Job', @@ -144,17 +155,49 @@ export default { ] }, { - path: 'adhoc', - name: 'Adhoc', - component: () => import('@/views/ops/Adhoc'), + path: 'scripts', + name: 'ScriptManage', + component: () => import('@/views/ops/ScriptManage'), meta: { - title: i18n.t('route.BatchCommand'), + title: i18n.t('route.ScriptManage'), permissions: [] } }, { - path: 'command/:id', - component: () => import('@/views/ops/Adhoc/my/AdhocDetail'), + path: 'executions', + name: 'Executions', + component: () => import('@/views/ops/Executions'), + meta: { + title: i18n.t('route.Executions'), + permissions: [] + } + }, + + { + path: 'adhoc/:id/update', + name: 'AdhocUpdate', + component: () => import('@/views/ops/ScriptManage/Adhoc/AdhocUpdateCreate'), + hidden: true, + meta: { + title: i18n.t('route.updateAdhoc'), + permissions: [], + activeMenu: '/workbench/ops/adhoc' + } + }, + { + path: 'adhoc/create', + name: 'AdhocCreate', + hidden: true, + component: () => import('@/views/ops/ScriptManage/Adhoc/AdhocUpdateCreate'), + meta: { + title: i18n.t('ops.createAdhoc'), + permissions: [], + activeMenu: '/workbench/ops/adhoc' + } + }, + { + path: 'adhoc/:id', + component: () => import('@/views/ops/ScriptManage/Adhoc/AdhocDetail'), name: 'AdhocDetail', hidden: true, meta: { @@ -164,41 +207,10 @@ export default { } }, { - path: 'command/:id/update', - name: 'AdhocUpdate', - component: () => import('@/views/ops/Adhoc/my/AdhocUpdateCreate'), - hidden: true, - meta: { - title: i18n.t('route.updateAdhoc'), - permissions: [], - activeMenu: '/workbench/ops/adhoc' - } - }, - { - path: 'command/create', - name: 'AdhocCreate', - hidden: true, - component: () => import('@/views/ops/Adhoc/my/AdhocUpdateCreate'), - meta: { - title: i18n.t('ops.createAdhoc'), - permissions: [], - activeMenu: '/workbench/ops/adhoc' - } - }, - { - path: 'playbook', - name: 'Playbook', - component: () => import('@/views/ops/Playbook'), - meta: { - title: i18n.t('route.BatchScript'), - permissions: [] - } - }, - { - path: 'flow/create', + path: 'playbook/create', name: 'PlaybookCreate', hidden: true, - component: () => import('@/views/ops/Playbook/PlaybookUpdateCreate'), + component: () => import('@/views/ops/ScriptManage/Playbook/PlaybookUpdateCreate'), meta: { title: i18n.t('route.PlaybookCreate'), permissions: [], diff --git a/src/views/ops/Adhoc/index.vue b/src/views/ops/Adhoc/index.vue deleted file mode 100644 index 265cf0c2c..000000000 --- a/src/views/ops/Adhoc/index.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/views/ops/Executions/index.vue b/src/views/ops/Executions/index.vue new file mode 100644 index 000000000..ca6916f1f --- /dev/null +++ b/src/views/ops/Executions/index.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue index f4d2cd59e..bcee65c90 100644 --- a/src/views/ops/Job/JobUpdateCreate.vue +++ b/src/views/ops/Job/JobUpdateCreate.vue @@ -27,8 +27,8 @@ export default { [this.$t('common.Basic'), ['name', 'type', 'instant', 'comment']], [this.$t('common.Task'), ['module', 'args', 'playbook', 'chdir', 'timeout']], [this.$t('ops.Asset'), ['assets', 'runas', 'runas_policy']], - [this.$t('ops.Plan'), ['runAfterSave', 'is_periodic', 'crontab']], - [this.$t('ops.Parameter'), ['use_parameter_define', 'parameters_define']] + [this.$t('ops.Parameter'), ['use_parameter_define', 'parameters_define']], + [this.$t('ops.Plan'), ['runAfterSave', 'is_periodic', 'crontab']] ], initial: { type: 'adhoc', @@ -121,7 +121,6 @@ export default { } }, use_parameter_define: { - label: this.$t('ops.UseParameterDefine'), type: 'switch', hidden: () => { return this.instantTask @@ -168,8 +167,7 @@ export default { this.ready = true } }, - methods: { - } + methods: {} } diff --git a/src/views/ops/Adhoc/InstantAdhoc.vue b/src/views/ops/Job/QuickJob.vue similarity index 67% rename from src/views/ops/Adhoc/InstantAdhoc.vue rename to src/views/ops/Job/QuickJob.vue index 755e1c51d..34acafad0 100644 --- a/src/views/ops/Adhoc/InstantAdhoc.vue +++ b/src/views/ops/Job/QuickJob.vue @@ -1,45 +1,51 @@ - - diff --git a/src/views/ops/Adhoc/MyAdhoc.vue b/src/views/ops/ScriptManage/Adhoc.vue similarity index 100% rename from src/views/ops/Adhoc/MyAdhoc.vue rename to src/views/ops/ScriptManage/Adhoc.vue diff --git a/src/views/ops/Adhoc/my/AdhocDetail/AdhocDetail.vue b/src/views/ops/ScriptManage/Adhoc/AdhocDetail/AdhocDetail.vue similarity index 100% rename from src/views/ops/Adhoc/my/AdhocDetail/AdhocDetail.vue rename to src/views/ops/ScriptManage/Adhoc/AdhocDetail/AdhocDetail.vue diff --git a/src/views/ops/Adhoc/my/AdhocDetail/index.vue b/src/views/ops/ScriptManage/Adhoc/AdhocDetail/index.vue similarity index 91% rename from src/views/ops/Adhoc/my/AdhocDetail/index.vue rename to src/views/ops/ScriptManage/Adhoc/AdhocDetail/index.vue index aa59d027f..39e9ad32f 100644 --- a/src/views/ops/Adhoc/my/AdhocDetail/index.vue +++ b/src/views/ops/ScriptManage/Adhoc/AdhocDetail/index.vue @@ -8,7 +8,7 @@