From baeece62d374cb3b16d1ee0156f4afd92f5ce628 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Fri, 5 Jul 2024 16:36:24 +0800 Subject: [PATCH] perf: Translate --- .../AccountChangeSecretRecord.vue | 4 ++-- .../AccountPushExecutionTaskList.vue | 4 ++-- src/views/ops/Adhoc/QuickJob.vue | 8 ++++---- src/views/ops/Adhoc/components/QuickJobTerm.vue | 12 +++++------- src/views/ops/Execution/index.vue | 2 +- src/views/tickets/AssignedTicketList.vue | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue index c1dd14d63..4081cf1a6 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue @@ -164,8 +164,8 @@ export default { }, extraMoreActions: [ { - name: 'BatchRetry', - title: this.$t('BatchRetry'), + name: 'RetrySelected', + title: this.$t('RetrySelected'), type: 'primary', fa: 'fa-retweet', can: ({ selectedRows }) => { diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionTaskList.vue b/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionTaskList.vue index abcdce8f5..eff8a3feb 100644 --- a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionTaskList.vue +++ b/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionTaskList.vue @@ -164,8 +164,8 @@ export default { }, extraMoreActions: [ { - name: 'BatchRetry', - title: this.$t('BatchRetry'), + name: 'RetrySelected', + title: this.$t('RetrySelected'), type: 'primary', fa: 'fa-retweet', can: ({ selectedRows }) => { diff --git a/src/views/ops/Adhoc/QuickJob.vue b/src/views/ops/Adhoc/QuickJob.vue index e26523158..ff2830e1b 100644 --- a/src/views/ops/Adhoc/QuickJob.vue +++ b/src/views/ops/Adhoc/QuickJob.vue @@ -430,7 +430,7 @@ export default { } createJob(data).then(res => { this.executionInfo.timeCost = 0 - this.executionInfo.status = 'running' + this.executionInfo.status = { value: 'running', label: this.$t('Running') } this.currentTaskId = res.task_id this.xtermConfig = { taskId: this.currentTaskId, type: 'shortcut_cmd' } this.setCostTimeInterval() @@ -451,12 +451,12 @@ export default { }) }, setBtn() { - if (this.executionInfo.status !== 'running') { + if (this.executionInfo.status.value !== 'running') { clearInterval(this.executionInfo.cancel) this.toolbar.left.run.icon = 'fa fa-play' } - this.toolbar.left.run.isVisible = this.executionInfo.status === 'running' - this.toolbar.left.stop.isVisible = this.executionInfo.status !== 'running' + this.toolbar.left.run.isVisible = this.executionInfo.status.value === 'running' + this.toolbar.left.stop.isVisible = this.executionInfo.status.value !== 'running' } } } diff --git a/src/views/ops/Adhoc/components/QuickJobTerm.vue b/src/views/ops/Adhoc/components/QuickJobTerm.vue index 3bb275912..626b53157 100644 --- a/src/views/ops/Adhoc/components/QuickJobTerm.vue +++ b/src/views/ops/Adhoc/components/QuickJobTerm.vue @@ -9,11 +9,11 @@ {{ $tc('Status') }}: {{ $tc('' + executionInfo.status) }} + >{{ $tc('' + executionInfo.status.label) }} {{ $tc('TimeDelta') }}: @@ -66,9 +66,7 @@ export default { executionInfo: { type: Object, // eslint-disable-next-line vue/require-valid-default-prop - default: { - status: 'success' - } + default: {} } }, data() { diff --git a/src/views/ops/Execution/index.vue b/src/views/ops/Execution/index.vue index d7cc84cf4..1c089a31a 100644 --- a/src/views/ops/Execution/index.vue +++ b/src/views/ops/Execution/index.vue @@ -23,7 +23,7 @@ export default { tableConfig: { url: '/api/v1/ops/job-executions/', columnsExclude: [ - 'summary', 'parameters' + 'summary', 'parameters', 'timedelta' ], columnsShow: { min: ['material', 'actions'], diff --git a/src/views/tickets/AssignedTicketList.vue b/src/views/tickets/AssignedTicketList.vue index b6884317d..ad8fabe27 100644 --- a/src/views/tickets/AssignedTicketList.vue +++ b/src/views/tickets/AssignedTicketList.vue @@ -43,7 +43,7 @@ export default { hasMoreActions: true, extraMoreActions: [ { - name: 'BatchApproval', + name: 'ApproveSelected', title: this.$t('ApproveSelected'), can: ({ selectedRows }) => { return selectedRows.length > 0 }, callback: function({ selectedRows }) {