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

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

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

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

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

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
             }
           },

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

src/views/pam/RiskDetect/AccountCheckExecutionList.vue

@@ -48,10 +48,10 @@ export default {
             formatter: DetailFormatter,
             formatterArgs: {
               getRoute: ({ row }) => ({
-                name: 'AccountCheckExecutionDetail',
+                name: 'RiskHistoryExecutionDetail',
-                params: { id: row.automation }
+                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 }
               })
             },

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,