From 322d12f27ff7068e7a5bb61d834ce8e3a0f2011b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 1 Nov 2024 19:06:39 +0800
Subject: [PATCH] perf: update accout check

---
 src/router/pam/automations.js                       |  7 +++----
 .../AccountBackup/AccountBackupDetail/index.vue     |  3 ++-
 .../AccountBackupExecutionInfo.vue                  |  0
 .../AccountBackupExecutionDetail/index.vue          |  0
 .../AccountBackupExecutionList.vue                  |  0
 src/views/accounts/AccountBackup/index.vue          |  2 +-
 .../{TaskDetail => }/ExecutionDetail/index.vue      |  0
 .../{TaskDetail => }/ExecutionDetail/info.vue       |  0
 src/views/accounts/const.js                         | 13 ++++++++++---
 9 files changed, 16 insertions(+), 9 deletions(-)
 rename src/views/accounts/AccountBackup/{AccountBackupDetail => }/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue (100%)
 rename src/views/accounts/AccountBackup/{AccountBackupDetail => }/AccountBackupExecution/AccountBackupExecutionDetail/index.vue (100%)
 rename src/views/accounts/AccountBackup/{AccountBackupDetail => }/AccountBackupExecution/AccountBackupExecutionList.vue (100%)
 rename src/views/accounts/AccountDiscover/{TaskDetail => }/ExecutionDetail/index.vue (100%)
 rename src/views/accounts/AccountDiscover/{TaskDetail => }/ExecutionDetail/info.vue (100%)

diff --git a/src/router/pam/automations.js b/src/router/pam/automations.js
index 86d386553..d100990d2 100644
--- a/src/router/pam/automations.js
+++ b/src/router/pam/automations.js
@@ -73,7 +73,7 @@ export default [
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountDiscover/TaskDetail/ExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountDiscover/ExecutionDetail/index.vue'),
         name: 'AccountDiscoverExecutionDetail',
         hidden: true,
         meta: {
@@ -210,7 +210,6 @@ export default [
         path: ':id',
         component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/index.vue'),
         name: 'AccountBackupDetail',
-        // activeMenu: '/console/accounts/automations',
         meta: {
           title: i18n.t('AccountBackupDetail'),
           activeMenu: '/console/accounts/automations'
@@ -219,14 +218,14 @@ export default [
       },
       {
         path: 'executions',
-        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue'),
         name: 'AccountBackupExecutionList',
         meta: { title: i18n.t('ExecutionDetail') },
         hidden: true
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue'),
         name: 'AccountBackupExecutionDetail',
         meta: { title: i18n.t('ExecutionDetail') },
         hidden: true
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
index 7c47b74bf..9c83493a9 100644
--- a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
@@ -9,7 +9,8 @@
 <script>
 import { GenericDetailPage } from '@/layout/components'
 import AccountBackupInfo from './AccountBackupInfo.vue'
-import AccountBackupExecutionList from './AccountBackupExecution/AccountBackupExecutionList.vue'
+import AccountBackupExecutionList
+from '@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue'
 
 export default {
   components: {
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
rename to src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
rename to src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
similarity index 100%
rename from src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue
rename to src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue
diff --git a/src/views/accounts/AccountBackup/index.vue b/src/views/accounts/AccountBackup/index.vue
index a7bddec50..9a9e1b9cb 100644
--- a/src/views/accounts/AccountBackup/index.vue
+++ b/src/views/accounts/AccountBackup/index.vue
@@ -25,7 +25,7 @@ export default {
             title: this.$t('ExecutionList'),
             name: 'AccountBackupExecutionList',
             hidden: !this.$hasPerm('accounts.view_accountbackupexecution'),
-            component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue')
+            component: () => import('@/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue')
           }
         ]
       }
diff --git a/src/views/accounts/AccountDiscover/TaskDetail/ExecutionDetail/index.vue b/src/views/accounts/AccountDiscover/ExecutionDetail/index.vue
similarity index 100%
rename from src/views/accounts/AccountDiscover/TaskDetail/ExecutionDetail/index.vue
rename to src/views/accounts/AccountDiscover/ExecutionDetail/index.vue
diff --git a/src/views/accounts/AccountDiscover/TaskDetail/ExecutionDetail/info.vue b/src/views/accounts/AccountDiscover/ExecutionDetail/info.vue
similarity index 100%
rename from src/views/accounts/AccountDiscover/TaskDetail/ExecutionDetail/info.vue
rename to src/views/accounts/AccountDiscover/ExecutionDetail/info.vue
diff --git a/src/views/accounts/const.js b/src/views/accounts/const.js
index f5338505b..a55068c6b 100644
--- a/src/views/accounts/const.js
+++ b/src/views/accounts/const.js
@@ -54,12 +54,14 @@ export const gatherAccountTableConfig = (vm, url) => {
     hasTree: true,
     columns: [
       'asset', 'username', 'date_last_login',
-      'address_last_login', 'present', 'date_updated', 'status'
+      'address_last_login', 'present',
+      'remote_present', 'status',
+      'date_updated'
     ],
     columnsShow: {
       default: [
         'username', 'asset', 'address_last_login',
-        'date_last_login', 'present', 'status'
+        'date_last_login', 'present', 'remote_present', 'status'
       ]
     },
     columnsMeta: {
@@ -80,7 +82,12 @@ export const gatherAccountTableConfig = (vm, url) => {
         showOverflowTooltip: true
       },
       present: {
-        width: '160px'
+        label: '已同步',
+        width: '120px'
+      },
+      remote_present: {
+        label: '远端存在',
+        width: '120px'
       },
       date_updated: {
         formatter: function(row, col, cell) {