From ded7920a8a1fa97891ff0a83d59d09832e4239a0 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Thu, 13 Feb 2025 18:55:33 +0800
Subject: [PATCH 1/4] perf: translate

---
 .../AccountBackupExecutionList.vue            |  2 +-
 .../AccountBackup/AccountBackupList.vue       |  2 +-
 .../AccountChangeSecretExecutionList.vue      |  2 +-
 .../accounts/AccountChangeSecret/index.vue    |  2 +-
 .../AccountPush/AccountPushExecutionList.vue  |  2 +-
 src/views/accounts/AccountPush/index.vue      |  2 +-
 src/views/pam/Integration/index.vue           |  2 +-
 .../RiskDetect/AccountCheckExecutionList.vue  | 36 ++++++++-----------
 8 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
index 5457187b0..c6686126d 100644
--- a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
@@ -30,7 +30,7 @@ export default {
         columnsShow: {
           default: [
             'automation', 'backup_name', 'trigger',
-            'date_start', 'date_finished', 'duration', 'actions'
+            'date_start', 'date_finished', 'actions'
           ]
         },
         columnsMeta: {
diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue
index 2b4f41828..9844319fc 100644
--- a/src/views/accounts/AccountBackup/AccountBackupList.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupList.vue
@@ -38,7 +38,7 @@ export default {
         columnsShow: {
           min: ['name', 'actions'],
           default: [
-            'name', 'backup_type', 'org_name', 'periodic_display',
+            'name', 'backup_type', 'periodic_display',
             'executed_amount', 'is_active', 'actions'
           ]
         },
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
index 497a01acc..bb33d13cd 100644
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
@@ -22,7 +22,7 @@ export default {
         ],
         columnsShow: {
           default: [
-            'automation', 'change_secret_name', 'status',
+            'automation', 'change_secret_name', 'trigger', 'status',
             'date_start', 'date_finished', 'actions'
           ]
         },
diff --git a/src/views/accounts/AccountChangeSecret/index.vue b/src/views/accounts/AccountChangeSecret/index.vue
index 76058c4b0..8934928ba 100644
--- a/src/views/accounts/AccountChangeSecret/index.vue
+++ b/src/views/accounts/AccountChangeSecret/index.vue
@@ -36,7 +36,7 @@ export default {
               )
           },
           {
-            title: this.$t('AccountRecord'),
+            title: this.$t('RecordList'),
             name: 'ChangeSecretRecord',
             hidden: () => !this.$hasPerm('accounts.view_changesecretrecord'),
             component: () => import(
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionList.vue b/src/views/accounts/AccountPush/AccountPushExecutionList.vue
index b18ffa193..6a2a483a0 100644
--- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue
+++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue
@@ -28,7 +28,7 @@ export default {
         ],
         columnsShow: {
           default: [
-            'automation', 'push_user_name', 'status',
+            'automation', 'push_user_name', 'trigger', 'status',
             'date_start', 'date_finished', 'actions'
           ]
         },
diff --git a/src/views/accounts/AccountPush/index.vue b/src/views/accounts/AccountPush/index.vue
index f6e91577d..af4e0b3db 100644
--- a/src/views/accounts/AccountPush/index.vue
+++ b/src/views/accounts/AccountPush/index.vue
@@ -28,7 +28,7 @@ export default {
             component: () => import('@/views/accounts/AccountPush/AccountPushExecutionList.vue')
           },
           {
-            title: this.$t('AccountRecord'),
+            title: this.$t('RecordList'),
             name: 'AccountPushRecord',
             hidden: () => !this.$hasPerm('accounts.view_pushsecretrecord'),
             component: () => import(
diff --git a/src/views/pam/Integration/index.vue b/src/views/pam/Integration/index.vue
index 62512bf99..837cd3b7a 100644
--- a/src/views/pam/Integration/index.vue
+++ b/src/views/pam/Integration/index.vue
@@ -26,7 +26,7 @@ export default {
           },
           {
             name: 'records',
-            title: this.$t('Records'),
+            title: this.$t('RecordList'),
             hidden: !this.$hasPerm('audits.view_integrationapplicationlog'),
             component: () => import('@/views/pam/Integration/components/CallRecords.vue')
           },
diff --git a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue
index 04e2bf9a8..5fdc4272c 100644
--- a/src/views/pam/RiskDetect/AccountCheckExecutionList.vue
+++ b/src/views/pam/RiskDetect/AccountCheckExecutionList.vue
@@ -8,7 +8,7 @@ import { openTaskPage } from '@/utils/jms'
 import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
-  name: 'AccountPushExecutionList',
+  name: 'CheckAccountExecutionList',
   components: {
     GenericListTable
   },
@@ -24,7 +24,7 @@ export default {
       tableConfig: {
         url: '/api/v1/accounts/check-account-executions/',
         columns: [
-          'task_name', 'asset_amount',
+          'automation', 'task_name', 'asset_amount',
           'node_amount', 'status', 'trigger',
           'date_start', 'date_finished', 'actions'
         ],
@@ -36,9 +36,16 @@ export default {
         },
         columnsMeta: {
           automation: {
-            label: this.$t('TaskID'),
-            formatter: function(row) {
-              return <span>{row.automation}</span>
+            label: this.$t('ID'),
+            formatter: DetailFormatter,
+            formatterArgs: {
+              route: 'AccountCheckExecutionDetail',
+              getRoute: ({ row }) => ({
+                name: 'AccountCheckExecutionDetail',
+                params: { id: row.id }
+              }),
+              drawer: true,
+              can: this.$hasPerm('accounts.view_checkaccountexecution')
             }
           },
           task_name: {
@@ -68,12 +75,6 @@ export default {
           status: {
             label: this.$t('Result')
           },
-          timedelta: {
-            label: this.$t('TimeDelta'),
-            formatter: function(row) {
-              return row.timedelta.toFixed(2) + 's'
-            }
-          },
           actions: {
             formatterArgs: {
               hasDelete: false,
@@ -83,26 +84,17 @@ export default {
                 {
                   name: 'log',
                   type: 'primary',
-                  can: this.$hasPerm('accounts.view_pushaccountexecution'),
+                  can: this.$hasPerm('accounts.view_checkaccountexecution'),
                   title: this.$t('Log'),
                   callback: function({ row }) {
                     openTaskPage(row['id'])
                   }
                 },
-                {
-                  name: 'detail',
-                  title: this.$t('Detail'),
-                  type: 'info',
-                  can: this.$hasPerm('accounts.view_pushaccountexecution'),
-                  callback: function({ row }) {
-                    return this.$router.push({ name: 'AccountCheckExecutionDetail', params: { id: row.id }})
-                  }
-                },
                 {
                   name: 'report',
                   title: this.$t('Report'),
                   type: 'success',
-                  can: this.$hasPerm('accounts.view_pushaccountexecution'),
+                  can: this.$hasPerm('accounts.view_checkaccountexecution'),
                   callback: function({ row }) {
                     window.open(`/api/v1/accounts/check-account-executions/${row.id}/report/`)
                   }

From e6cd2306c9ed6928a0c848f0d020876466f8756a Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Mon, 17 Feb 2025 17:08:55 +0800
Subject: [PATCH 2/4] Fixed: Fix responsive issues

---
 .../dashboard/ChangeSecret/CardSummary.vue    |  4 +-
 .../dashboard/ChangeSecret/DataSummary.vue    |  2 +-
 src/views/dashboard/ChangeSecret/index.vue    | 26 +++++++--
 src/views/dashboard/Pam/MissionSummery.vue    | 58 +++++--------------
 src/views/dashboard/Pam/index.vue             | 16 +++--
 5 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/views/dashboard/ChangeSecret/CardSummary.vue b/src/views/dashboard/ChangeSecret/CardSummary.vue
index 3f03673b3..a6245ce55 100644
--- a/src/views/dashboard/ChangeSecret/CardSummary.vue
+++ b/src/views/dashboard/ChangeSecret/CardSummary.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-row :gutter="16">
-      <el-col :lg="12" :sm="24" class="margin-top-10 card-left">
+      <el-col :lg="12" :md="24" class="margin-top-10 card-left">
         <SummaryCountCard :config="logConfig" :items="LogItems" />
       </el-col>
-      <el-col :lg="12" :sm="24" class="margin-top-10 card-right">
+      <el-col :lg="12" :md="24" class="margin-top-10 card-right">
         <SummaryCountCard :config="sessionConfig" :items="sessionItems" />
       </el-col>
     </el-row>
diff --git a/src/views/dashboard/ChangeSecret/DataSummary.vue b/src/views/dashboard/ChangeSecret/DataSummary.vue
index 35b1ae4c8..f353f9565 100644
--- a/src/views/dashboard/ChangeSecret/DataSummary.vue
+++ b/src/views/dashboard/ChangeSecret/DataSummary.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :gutter="16">
-      <el-col :lg="24" :sm="12" class="margin-top-10">
+      <el-col :sm="24" :md="24" class="margin-top-10">
         <SummaryCountCard :config="logConfig" :items="LogItems" />
       </el-col>
     </el-row>
diff --git a/src/views/dashboard/ChangeSecret/index.vue b/src/views/dashboard/ChangeSecret/index.vue
index 3881a2420..597de23a9 100644
--- a/src/views/dashboard/ChangeSecret/index.vue
+++ b/src/views/dashboard/ChangeSecret/index.vue
@@ -4,14 +4,13 @@
       <SwitchDate class="switch-date" @change="onChange" />
     </div>
 
-    <el-row type="flex">
-
-      <el-col :span="16">
+    <el-row>
+      <el-col :lg="16" :md="24">
         <CardSummary :days="days" class="card-summary" />
       </el-col>
 
-      <el-col :span="8">
-        <DataSummary :days="days" class="data-summary" style="margin-left: 1rem" />
+      <el-col :lg="8" :md="24">
+        <DataSummary :days="days" class="data-summary" />
       </el-col>
 
     </el-row>
@@ -106,4 +105,21 @@ export default {
       margin-bottom: unset !important;
     }
   }
+
+  .data-summary {
+    margin-left: 1rem
+  }
+
+  .account-summary,
+  .data-summary,
+  .card-summary,
+  .failed-account-summary {
+    min-width: 670px;
+  }
+
+  @media (max-width: 1200px) {
+    ::v-deep .data-summary {
+      margin-left: unset !important;
+    }
+  }
 </style>
diff --git a/src/views/dashboard/Pam/MissionSummery.vue b/src/views/dashboard/Pam/MissionSummery.vue
index e1cb66676..0ff795fc6 100644
--- a/src/views/dashboard/Pam/MissionSummery.vue
+++ b/src/views/dashboard/Pam/MissionSummery.vue
@@ -43,55 +43,28 @@ export default {
       return {
         tooltip: {
           trigger: 'item',
-          formatter: (params) => {
+          formatter: params => {
             return `${params.name}: ${params.value} (${params.percent}%)`
           }
         },
         legend: {
-          orient: 'vertical',
-          top: '25%',
-          right: this.$i18n.locale === 'zh' ? '20%' : '10%',
-          itemGap: 20,
-          textStyle: {
-            color: '#666',
-            fontSize: 12
-          },
-          icon: 'circle',
-          itemWidth: 8,
-          itemHeight: 8,
-          formatter: (name) => {
-            const data = [
-              { name: this.$t('BaseAccountChangeSecret'), value: this.counter.total_count_change_secret_automation },
-              { name: this.$t('BaseAccountPush'), value: this.counter.total_count_push_account_automation },
-              { name: this.$t('DiscoverAccounts'), value: this.counter.total_count_gathered_account_automation },
-              { name: this.$t('AccountBackup'), value: this.counter.total_count_backup_account_automation },
-              { name: this.$t('RelevantApp'), value: this.counter.total_count_integration_application }
-            ]
-
-            const item = data.find(item => item.name === name)
-            return `${name}: ${item?.value || 0}`
-          },
-          rich: {
-            name: {
-              width: this.$i18n.locale === 'zh' ? 120 : 200,
-              color: '#666',
-              fontSize: 12,
-              padding: [0, 15, 0, 0]
-            },
-            value: {
-              width: 60,
-              align: 'right',
-              color: '#666',
-              fontSize: 12
-            }
-          }
+          icon: 'rect',
+          itemWidth: 10,
+          itemHeight: 10,
+          left: '2%'
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
         },
         series: [
           {
             name: this.$t('Task Distribution'),
             type: 'pie',
-            radius: ['50%', '60%'],
-            center: ['30%', '50%'],
+            top: '10%',
+            radius: ['45%', '60%'],
             label: {
               show: false
             },
@@ -194,7 +167,8 @@ export default {
   border-radius: 4px;
 
   .header {
-    padding: 1.25rem;
+    padding: 1.25rem 1.25rem 0;
+    margin-bottom: 8px;
 
     .content {
       justify-content: flex-start;
@@ -212,7 +186,7 @@ export default {
 
     .chart-container {
       width: 100%;
-      height: 19.25rem;
+      height: 321px;
     }
   }
 }
diff --git a/src/views/dashboard/Pam/index.vue b/src/views/dashboard/Pam/index.vue
index c85fb363c..f7b0cd070 100644
--- a/src/views/dashboard/Pam/index.vue
+++ b/src/views/dashboard/Pam/index.vue
@@ -5,19 +5,19 @@
 
       <div class="summary-container">
         <el-row :gutter="20">
-          <el-col :span="16">
+          <el-col :span="16" :xs="24">
             <DataSummary class="data-summery" />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" :xs="24">
             <AccountSecretSummary class="account-secret-summary" />
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="16">
+          <el-col :span="16" :xs="24">
             <RiskSummary class="risk-summary" />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" :xs="24">
             <MissionSummery class="mission-summery" />
           </el-col>
         </el-row>
@@ -83,9 +83,15 @@ export default {
     margin-top: unset;
 
     ::v-deep .echarts {
-      height: 205px;
+      height: 178px;
     }
   }
+}
 
+@media (max-width: 768px) {
+  .risk-summary,
+  .data-summery {
+    margin-bottom: 1.25rem;
+  }
 }
 </style>

From fa2faecb7c64fb742e73bf481b4be8732592d224 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Mon, 17 Feb 2025 17:18:47 +0800
Subject: [PATCH 3/4] Fixed: Fix card overflow issue on screen resize

---
 src/views/dashboard/ChangeSecret/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/ChangeSecret/index.vue b/src/views/dashboard/ChangeSecret/index.vue
index 597de23a9..357cf21b2 100644
--- a/src/views/dashboard/ChangeSecret/index.vue
+++ b/src/views/dashboard/ChangeSecret/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="this.$hasPerm('accounts.view_changesecretautomation')">
+  <div v-if="this.$hasPerm('accounts.view_changesecretautomation')" class="change-secret-container">
     <div class="switch-date-wrapper">
       <SwitchDate class="switch-date" @change="onChange" />
     </div>
@@ -82,6 +82,10 @@ export default {
     }
   }
 
+  .change-secret-container {
+    min-width: 670px;
+  }
+
   .switch-date-wrapper {
     margin-bottom: 1.25rem;
   }
@@ -114,7 +118,7 @@ export default {
   .data-summary,
   .card-summary,
   .failed-account-summary {
-    min-width: 670px;
+    min-width: unset;
   }
 
   @media (max-width: 1200px) {

From 27e2d3417148929c1430e9dcb7a94d109d8c385c Mon Sep 17 00:00:00 2001
From: w940853815 <940853815@qq.com>
Date: Tue, 18 Feb 2025 11:16:39 +0800
Subject: [PATCH 4/4] fix: Create playbook job form error

---
 src/views/ops/Job/JobUpdateCreate.vue     | 56 +++++++++++------------
 src/views/ops/Job/components/Adhoc.vue    |  9 +++-
 src/views/ops/Job/components/PlayBook.vue | 14 +++---
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index 702511c33..909d5aa3e 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -158,37 +158,33 @@ export default {
     }
   },
   mounted() {
-    if (this.$route.query && this.$route.query.type) {
-      this.initial.type = 'adhoc'
-      switch (this.$route.query.type) {
-        case 'adhoc':
-          this.initial.type = 'adhoc'
-          if (this.$route.query.id) {
-            this.$axios.get(`/api/v1/ops/adhocs/${this.$route.query.id}`).then((data) => {
-              this.initial.module = data.module
-              this.initial.args = data.args
-              this.initial.instant = true
-              this.initial.runAfterSave = true
-              this.instantTask = true
-              this.createSuccessNextRoute = { name: 'Adhoc' }
-              this.ready = true
-            })
-          } else {
+    const type = this.$route.query['_type']
+    switch (type) {
+      case 'adhoc':
+        this.initial.type = 'adhoc'
+        if (this.$route.query.id) {
+          this.$axios.get(`/api/v1/ops/adhocs/${this.$route.query.id}`).then((data) => {
+            this.initial.module = data.module
+            this.initial.args = data.args
+            this.initial.instant = true
+            this.initial.runAfterSave = true
+            this.instantTask = true
+            this.createSuccessNextRoute = { name: 'Adhoc' }
             this.ready = true
-          }
-          break
-        case 'playbook':
-          this.initial.type = 'playbook'
-          if (this.$route.query.id) {
-            this.initial.playbook = this.$route.query.id
-            this.ready = true
-          } else {
-            this.ready = true
-          }
-          break
-      }
-    } else {
-      this.ready = true
+          })
+        } else {
+          this.ready = true
+        }
+        break
+      case 'playbook':
+        this.initial.type = 'playbook'
+        if (this.$route.query.id) {
+          this.initial.playbook = this.$route.query.id
+          this.ready = true
+        } else {
+          this.ready = true
+        }
+        break
     }
   },
   methods: {}
diff --git a/src/views/ops/Job/components/Adhoc.vue b/src/views/ops/Job/components/Adhoc.vue
index dc2ab8763..cfc86bbbf 100644
--- a/src/views/ops/Job/components/Adhoc.vue
+++ b/src/views/ops/Job/components/Adhoc.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <GenericListTable
+      ref="ListTable"
       :create-drawer="createDrawer"
       :detail-drawer="detailDrawer"
       :header-actions="headerActions"
@@ -22,6 +23,7 @@ export default {
     JobRunDialog
   },
   data() {
+    const vm = this
     return {
       item: {},
       createDrawer: () => import('@/views/ops/Job/JobUpdateCreate.vue'),
@@ -113,7 +115,12 @@ export default {
         }
       },
       headerActions: {
-        createRoute: 'JobCreate',
+        onCreate: () => {
+          vm.$router.push({
+            query: { _type: 'adhoc' }
+          })
+          vm.$refs.ListTable.onCreate()
+        },
         hasRefresh: true,
         hasExport: false,
         hasImport: false
diff --git a/src/views/ops/Job/components/PlayBook.vue b/src/views/ops/Job/components/PlayBook.vue
index 43eee0d5a..d766779d0 100644
--- a/src/views/ops/Job/components/PlayBook.vue
+++ b/src/views/ops/Job/components/PlayBook.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <GenericListTable
+      ref="ListTable"
       :create-drawer="createDrawer"
       :detail-drawer="detailDrawer"
       :header-actions="headerActions"
@@ -23,6 +24,7 @@ export default {
     JobRunDialog
   },
   data() {
+    const vm = this
     return {
       createDrawer: () => import('@/views/ops/Job/JobUpdateCreate.vue'),
       detailDrawer: () => import('@/views/ops/Job/JobDetail/index.vue'),
@@ -117,13 +119,11 @@ export default {
         hasRefresh: true,
         hasExport: false,
         hasImport: false,
-        createRoute: () => {
-          return {
-            name: 'JobCreate',
-            query: {
-              type: 'playbook'
-            }
-          }
+        onCreate: () => {
+          vm.$router.push({
+            query: { _type: 'playbook' }
+          })
+          vm.$refs.ListTable.onCreate()
         }
       },
       showJobRunDialog: false