diff --git a/src/router/pam/security.js b/src/router/pam/security.js index c5b752804..671a8463f 100644 --- a/src/router/pam/security.js +++ b/src/router/pam/security.js @@ -129,6 +129,16 @@ export default [ permissions: ['accounts.view_accountrisk'] }, hidden: true + }, + { + path: 'executions/:id', + component: () => import('@/views/pam/RiskDetect/RiskHistoryExecutionDetail/index.vue'), + name: 'RiskHistoryExecutionDetail', + hidden: true, + meta: { + title: i18n.t('ExecutionDetail'), + permissions: ['accounts.view_checkaccountexecution'] + } } ] } diff --git a/src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue b/src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue index ba59b52f0..2f90346f8 100644 --- a/src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue +++ b/src/views/accounts/AccountBackup/Detail/AccountBackupInfo.vue @@ -45,7 +45,7 @@ export default { click: function() { this.$axios.post( `/api/v1/accounts/account-backup-plan-executions/`, - { plan: this.object.id } + { automation: this.object.id } ).then(res => { openTaskPage(res['task']) }) diff --git a/src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue index af372ebd8..a37039d0a 100644 --- a/src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue +++ b/src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue @@ -51,7 +51,7 @@ export default { name: 'AccountBackupExecutionDetail', params: { id: row.id } }), - getTitle: ({ row }) => row.automation.slice(0, 8), + getTitle: ({ row }) => row.id.slice(0, 8), drawer: true, can: this.$hasPerm('accounts.view_backupaccountexecution') } diff --git a/src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue index 13686a7d2..2e5a3f3ca 100644 --- a/src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue +++ b/src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue @@ -44,7 +44,7 @@ export default { name: 'AccountChangeSecretExecutionDetail', params: { id: row.id } }), - getTitle: ({ row }) => row.automation.slice(0, 8), + getTitle: ({ row }) => row.id.slice(0, 8), drawer: true, can: this.$hasPerm('accounts.view_changesecretexecution') } diff --git a/src/views/accounts/AccountDiscover/TaskExecutionList.vue b/src/views/accounts/AccountDiscover/TaskExecutionList.vue index 1a82d9e88..43e18ddf8 100644 --- a/src/views/accounts/AccountDiscover/TaskExecutionList.vue +++ b/src/views/accounts/AccountDiscover/TaskExecutionList.vue @@ -51,7 +51,7 @@ export default { name: 'AccountDiscoverExecutionDetail', params: { id: row.id } }), - getTitle: ({ row }) => row.automation.slice(0, 8), + getTitle: ({ row }) => row.id.slice(0, 8), drawer: true } }, diff --git a/src/views/accounts/AccountPush/AccountPushExecutionList.vue b/src/views/accounts/AccountPush/AccountPushExecutionList.vue index 31e25ebc4..b3c745ae5 100644 --- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue +++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue @@ -50,7 +50,7 @@ export default { name: 'AccountPushExecutionDetail', params: { id: row.id } }), - getTitle: ({ row }) => row.automation.slice(0, 8), + getTitle: ({ row }) => row.id.slice(0, 8), drawer: true, can: this.$hasPerm('accounts.view_pushaccountexecution') } diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue index e5b113060..361e0b1cc 100644 --- a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue +++ b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue @@ -48,10 +48,10 @@ export default { formatter: DetailFormatter, formatterArgs: { getRoute: ({ row }) => ({ - name: 'AccountCheckExecutionDetail', - params: { id: row.automation } + name: 'RiskHistoryExecutionDetail', + params: { id: row.id } }), - getTitle: ({ row }) => row.automation.slice(0, 8), + getTitle: ({ row }) => row.id.slice(0, 8), drawer: true, can: this.$hasPerm('accounts.view_checkaccountexecution') } @@ -63,7 +63,7 @@ export default { drawer: true, getTitle: ({ row }) => row.snapshot.name, getRoute: ({ row }) => ({ - name: 'AccountCheckList', + name: 'AccountCheckDetail', params: { id: row.automation } }) }, diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionDetail/AccountPushExecutionInfo.vue b/src/views/pam/RiskDetect/RiskHistoryExecutionDetail/AccountPushExecutionInfo.vue similarity index 100% rename from src/views/pam/RiskDetect/AccountCheckExecutionDetail/AccountPushExecutionInfo.vue rename to src/views/pam/RiskDetect/RiskHistoryExecutionDetail/AccountPushExecutionInfo.vue diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionDetail/AccountPushExecutionTaskList.vue b/src/views/pam/RiskDetect/RiskHistoryExecutionDetail/AccountPushExecutionTaskList.vue similarity index 100% rename from src/views/pam/RiskDetect/AccountCheckExecutionDetail/AccountPushExecutionTaskList.vue rename to src/views/pam/RiskDetect/RiskHistoryExecutionDetail/AccountPushExecutionTaskList.vue diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionDetail/index.vue b/src/views/pam/RiskDetect/RiskHistoryExecutionDetail/index.vue similarity index 96% rename from src/views/pam/RiskDetect/AccountCheckExecutionDetail/index.vue rename to src/views/pam/RiskDetect/RiskHistoryExecutionDetail/index.vue index 8595a7b08..250e77a20 100644 --- a/src/views/pam/RiskDetect/AccountCheckExecutionDetail/index.vue +++ b/src/views/pam/RiskDetect/RiskHistoryExecutionDetail/index.vue @@ -21,7 +21,7 @@ export default { return { execution: { id: '' }, config: { - url: '/api/v1/accounts/push-account-executions', + url: '/api/v1/accounts/check-account-executions', activeMenu: 'AccountPushExecutionInfo', actions: { hasUpdate: false,