From f4b09a76b864c9e661748e2ae60ddf5cfa3754ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 28 Oct 2022 15:35:05 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=97=B6=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                        |  3 +++
 src/i18n/langs/ja.json                        |  3 +++
 src/i18n/langs/zh.json                        |  3 +++
 .../components/AccountTemplateDialog.vue      | 18 ++++++++++++++++-
 .../components/AddAccountDialog.vue           | 20 ++++++++++++++-----
 .../components/AssetAccounts.vue              | 18 +++++++++--------
 6 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ec77b2f69..4c36f4846 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -93,6 +93,8 @@
     "NoSQLProtocol": "NoSQL Protocol"
   },
   "assets": {
+    "SelectTemplate": "Select template",
+    "InAssetDetail": "Update account information in asset details",
     "All": "All",
     "CloudPlatform": "Cloud platform",
     "RecentlyUsed": "Recently used",
@@ -314,6 +316,7 @@
     "Active": "Active",
     "TableColSettingInfo": "Please select the list details you want to display",
     "Add": "Add",
+    "TemplateAdd": "Template add",
     "PleaseAgreeToTheTerms": "Please agree to the terms",
     "PushSelected": "Push selected",
     "PushSelectedSystemUsersToAsset": "Push selected system users to asset",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 73e09dd76..55e7338d8 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -98,6 +98,8 @@
     "NoSQLProtocol": "非リレーショナルデータベース"
   },
   "assets": {
+    "SelectTemplate": "テンプレートの選択",
+    "InAssetDetail": "資産詳細でのアカウント情報の更新",
     "All": "すべて",
     "CloudPlatform": "クラウドプラットフォーム",
     "RecentlyUsed": "最近使われる",
@@ -321,6 +323,7 @@
     "actionsTips": "クリップボード権限制御は現在RDP/VNCプロトコルの接続のみをサポートしています",
     "TableColSettingInfo": "表示したいリストの詳細を選択してください。",
     "Add": "追加",
+    "TemplateAdd": "テンプレートの追加",
     "UpdateAssetDetail": "詳細情報の設定",
     "AddSuccessMsg": "追加に成功しました",
     "Auth": "認証",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index cf64f3285..2efbd0103 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -98,6 +98,8 @@
     "NoSQLProtocol": "非关系数据库"
   },
   "assets": {
+    "SelectTemplate": "选择模版",
+    "InAssetDetail": "在资产详情中更新账号信息",
     "Address": "地址",
     "PrivateKey": "密钥",
     "Secret": "密码",
@@ -326,6 +328,7 @@
     "actionsTips": "剪切板权限控制目前仅支持 RDP/VNC 协议的连接",
     "TableColSettingInfo": "请选择您想显示的列表详细信息。",
     "Add": "添加",
+    "TemplateAdd": "模版添加",
     "UpdateAssetDetail": "配置更多信息",
     "AddSuccessMsg": "添加成功",
     "Auth": "认证",
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
index 5feb8c747..a99731817 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
@@ -1,6 +1,8 @@
 <template>
   <Dialog
-    :title="'选择模版'"
+    v-if="iVisible"
+    :title="$t('assets.SelectTemplate')"
+    :visible.sync="iVisible"
     :destroy-on-close="true"
     width="70%"
     v-bind="$attrs"
@@ -20,6 +22,10 @@ export default {
     AutoDataTable
   },
   props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -33,6 +39,16 @@ export default {
         }
       }
     }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue
index 2153cd426..e998333e7 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue
@@ -1,8 +1,8 @@
 <template>
   <Dialog
-    v-if="visible"
-    :title="this.$tc('assets.AddAccount')"
-    :visible.sync="visible"
+    v-if="iVisible"
+    :title="this.$t('assets.AddAccount')"
+    :visible.sync="iVisible"
     :destroy-on-close="true"
     :show-cancel="false"
     :show-confirm="false"
@@ -47,6 +47,16 @@ export default {
   data() {
     return {}
   },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
   methods: {
     addAccount(account) {
       const i = this.accounts.findIndex(item => item.username === account.username)
@@ -54,12 +64,12 @@ export default {
         this.accounts.splice(i, 1)
       }
       this.accounts.push(account)
-      this.$emit('update:visible', false)
+      this.iVisible = false
     },
     editAccount(form) {
       const i = this.accounts.findIndex(item => item.username === this.account.username)
       this.accounts.splice(i, 1, form)
-      this.$emit('update:visible', false)
+      this.iVisible = false
     }
   }
 }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
index c1985b6d7..b66788bdd 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
@@ -1,17 +1,15 @@
 <template>
   <div>
-    <div v-if="isUpdate(this)">
-      在资产详情中更新账号信息
-    </div>
+    <div v-if="isUpdate(this)">{{ $t('assets.InAssetDetail') }}</div>
     <div v-else class="accounts">
       <el-table :data="accounts" style="width: 100%">
-        <el-table-column prop="username" label="用户名" width="180" />
-        <el-table-column prop="privileged" label="特权账号">
+        <el-table-column prop="username" :label="$t('assets.Username')" width="180" />
+        <el-table-column prop="privileged" :label="$t('assets.Privileged')">
           <template v-slot="scope">
             <i class="fa text-primary" :class="scope.row['privileged'] ? 'fa-check' : ''" />
           </template>
         </el-table-column>
-        <el-table-column fixed="right" align="right" label="操作" width="135" class-name="buttons">
+        <el-table-column fixed="right" align="right" :label="$t('common.Actions')" width="135" class-name="buttons">
           <template v-slot="scope">
             <el-button type="danger" icon="el-icon-minus" size="mini" @click="removeAccount(scope.row)" />
             <el-button type="primary" icon="el-icon-edit" size="mini" @click="onEditClick(scope.row)" />
@@ -19,8 +17,12 @@
         </el-table-column>
       </el-table>
       <div class="actions">
-        <el-button size="mini" type="primary" @click="onAddClick">添加</el-button>
-        <el-button size="mini" type="success" @click="onAddFromTemplateClick">模版添加</el-button>
+        <el-button size="mini" type="primary" @click="onAddClick">
+          {{ $t('common.Add') }}
+        </el-button>
+        <el-button size="mini" type="success" @click="onAddFromTemplateClick">
+          {{ $t('common.TemplateAdd') }}
+        </el-button>
       </div>
       <AddAccountDialog
         :visible.sync="addAccountDialogVisible"

From d8deab799ef35fdb94e8c5ffa9da8f660e2700e5 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Fri, 28 Oct 2022 19:01:53 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E6=8B=86=E5=88=86ops=20=E5=92=8Cta?=
 =?UTF-8?q?sk=20=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                        |   6 +-
 src/i18n/langs/ja.json                        |   2 +-
 src/i18n/langs/zh.json                        |   4 +-
 src/router/audit/logs.js                      |   4 +-
 src/router/common.js                          |   4 +-
 src/router/console/index.js                   |  12 +-
 src/router/console/ops.js                     |  64 ----
 src/router/console/tasks.js                   |  32 ++
 src/router/workbench/index.js                 |  53 ++--
 src/views/ops/Command.vue                     |  13 +
 src/views/ops/CommandExecution.vue            | 279 ------------------
 .../TaskDetail/AdhocDetail/AdhocDetail.vue    | 138 ---------
 .../AdhocDetail/AdhocExecutionHistory.vue     | 106 -------
 .../ops/TaskDetail/AdhocDetail/index.vue      |  47 ---
 src/views/ops/TaskList.vue                    | 179 -----------
 src/views/{ops => tasks}/CeleryTaskLog.vue    |   0
 .../{ops => tasks}/RunInfoCard/index.vue      |   0
 .../HistoryExecutionDetail.vue                |   2 +-
 .../HistoryExecutionDetail/index.vue          |   0
 .../{ops => tasks}/TaskDetail/TaskDetail.vue  |   0
 .../{ops => tasks}/TaskDetail/TaskHistory.vue |   2 +-
 .../{ops => tasks}/TaskDetail/business.js     |   0
 src/views/{ops => tasks}/TaskDetail/index.vue |   0
 src/views/tasks/TaskList.vue                  |  81 +++++
 24 files changed, 179 insertions(+), 849 deletions(-)
 delete mode 100644 src/router/console/ops.js
 create mode 100644 src/router/console/tasks.js
 create mode 100644 src/views/ops/Command.vue
 delete mode 100644 src/views/ops/CommandExecution.vue
 delete mode 100644 src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
 delete mode 100644 src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
 delete mode 100644 src/views/ops/TaskDetail/AdhocDetail/index.vue
 delete mode 100644 src/views/ops/TaskList.vue
 rename src/views/{ops => tasks}/CeleryTaskLog.vue (100%)
 rename src/views/{ops => tasks}/RunInfoCard/index.vue (100%)
 rename src/views/{ops => tasks}/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue (97%)
 rename src/views/{ops => tasks}/TaskDetail/HistoryExecutionDetail/index.vue (100%)
 rename src/views/{ops => tasks}/TaskDetail/TaskDetail.vue (100%)
 rename src/views/{ops => tasks}/TaskDetail/TaskHistory.vue (96%)
 rename src/views/{ops => tasks}/TaskDetail/business.js (100%)
 rename src/views/{ops => tasks}/TaskDetail/index.vue (100%)
 create mode 100644 src/views/tasks/TaskList.vue

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 4c36f4846..acb090810 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -738,7 +738,8 @@
     "SessionsAudit": "Sessions audit",
     "SessionList": "Session list",
     "BatchCommand": "Batch Command",
-    "BatchCommandLog": "Batch Command Logs",
+    "BatchScript": "Batch Script",
+    "tasksLog": "Batch Command Logs",
     "CeleryTaskLog": "Celery task log",
     "CommandExecutions": "CommandExecutions ",
     "CommandFilterCreate": "Command filter create",
@@ -787,7 +788,8 @@
     "FtpLog": "FTP Logs",
     "GatewayCreate": "Gateway create",
     "GatewayUpdate": "Gateway update",
-    "JobCenter": "Devops",
+    "TaskCenter": "Task",
+    "JobCenter": "Job",
     "LabelCreate": "Label create",
     "LabelList": "Labels",
     "LabelUpdate": "Label update",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 55e7338d8..2e2e08223 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -751,7 +751,7 @@
     "TicketsTodo": "To-doオーダー",
     "TicketsDone": "すでに勤務単",
     "TicketsNew": "ワークオーダーを提出する",
-    "BatchCommandLog": "一括コマンド",
+    "tasksLog": "一括コマンド",
     "CeleryTaskLog": "Celeryタスクログ",
     "CommandExecutions": "コマンド実行",
     "CommandFilterCreate": "コマンドフィルタの作成",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 2efbd0103..58447e15f 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -766,10 +766,11 @@
     "LogsAudit": "日志审计",
     "SessionList": "会话记录",
     "BatchCommand": "批量命令",
+    "BatchScript": "批量脚本",
     "TicketsTodo": "待办工单",
     "TicketsDone": "已办工单",
     "TicketsNew": "提交工单",
-    "BatchCommandLog": "批量命令",
+    "tasksLog": "批量命令",
     "CeleryTaskLog": "Celery任务日志",
     "CommandExecutions": "命令执行",
     "CommandFilterCreate": "创建命令过滤器",
@@ -820,6 +821,7 @@
     "FtpLog": "FTP日志",
     "GatewayCreate": "创建网关",
     "GatewayUpdate": "更新网关",
+    "TaskCenter": "任务中心",
     "JobCenter": "作业中心",
     "LabelCreate": "创建标签",
     "LabelList": "标签管理",
diff --git a/src/router/audit/logs.js b/src/router/audit/logs.js
index d4ae0c2ee..aa127c6a5 100644
--- a/src/router/audit/logs.js
+++ b/src/router/audit/logs.js
@@ -30,10 +30,10 @@ export default [
   },
   {
     path: 'command-execution-log',
-    name: 'BatchCommandLog',
+    name: 'tasksLog',
     component: () => import('@/views/audits/CommandExecutionList'),
     meta: {
-      title: i18n.t('route.BatchCommandLog'),
+      title: i18n.t('route.tasksLog'),
       permissions: ['ops.view_commandexecution']
     }
   }
diff --git a/src/router/common.js b/src/router/common.js
index 208bc277d..1e781f366 100644
--- a/src/router/common.js
+++ b/src/router/common.js
@@ -7,7 +7,7 @@ import i18n from '@/i18n/i18n'
 export default [
   {
     path: '/ops/celery/task/:id/log/',
-    component: () => import('@/views/ops/CeleryTaskLog'),
+    component: () => import('@/views/tasks/CeleryTaskLog'),
     name: 'CeleryTaskLog',
     hidden: true,
     meta: {
@@ -17,7 +17,7 @@ export default [
   },
   {
     path: '/ops/task/task/:id/log/',
-    component: () => import('@/views/ops/CeleryTaskLog'),
+    component: () => import('@/views/tasks/CeleryTaskLog'),
     name: 'TaskLog',
     hidden: true,
     meta: {
diff --git a/src/router/console/index.js b/src/router/console/index.js
index fe143b9d2..823c01eb1 100644
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -6,7 +6,7 @@ import store from '@/store'
 import UsersRoute from './users'
 import AssetsRoute from './assets'
 import PermsRoute from './perms'
-import OpsRoutes from './ops'
+import TaskRoutes from './tasks'
 import AclRoutes from './acls'
 import AccountRoutes from './accounts'
 
@@ -88,14 +88,14 @@ export default {
       children: AclRoutes
     },
     {
-      path: '/console/ops',
+      path: '/console/tasks',
       component: empty,
-      name: 'JobCenter',
+      name: 'TaskCenter',
       meta: {
-        title: i18n.t('route.JobCenter'),
-        icon: 'coffee'
+        title: i18n.t('route.TaskCenter'),
+        icon: 'tasks'
       },
-      children: OpsRoutes
+      children: TaskRoutes
     }
   ]
 }
diff --git a/src/router/console/ops.js b/src/router/console/ops.js
deleted file mode 100644
index c6cbab122..000000000
--- a/src/router/console/ops.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import i18n from '@/i18n/i18n'
-import { BASE_URL } from '@/utils/common'
-import empty from '@/layout/empty'
-
-export default [
-  {
-    path: 'tasks',
-    component: empty,
-    meta: { title: i18n.t('route.TaskList') },
-    children: [
-      {
-        path: '',
-        name: 'TaskList',
-        component: () => import('@/views/ops/TaskList'),
-        meta: { title: i18n.t('route.TaskList'), permissions: [] }
-      },
-      {
-        path: ':id',
-        component: () => import('@/views/ops/TaskDetail'),
-        name: 'TaskDetail',
-        hidden: true,
-        meta: { title: i18n.t('route.TaskDetail'), permissions: [] }
-      }
-    ]
-  },
-  {
-    path: 'adhoc/:id',
-    component: () => import('@/views/ops/TaskDetail/AdhocDetail'),
-    name: 'AdhocDetail',
-    hidden: true,
-    meta: {
-      title: i18n.t('route.TaskDetail'),
-      permissions: ['ops.view_adhoc'],
-      activeMenu: '/ops/tasks'
-    }
-  },
-  {
-    path: 'executions/:id',
-    component: () => import('@/views/ops/TaskDetail/HistoryExecutionDetail'),
-    name: 'HistoryExecutionDetail',
-    hidden: true,
-    meta: {
-      title: i18n.t('route.TaskDetail'),
-      permissions: ['ops.view_adhocexecution'],
-      activeMenu: '/console/ops/tasks'
-    }
-  },
-  {
-    path: 'command-executions/create',
-    name: 'BatchCommand',
-    component: () => import('@/views/ops/CommandExecution'),
-    meta: {
-      title: i18n.t('route.BatchCommand'),
-      permissions: ['ops.add_adhocexecution'],
-      hidden: ({ settings }) => !settings['SECURITY_COMMAND_EXECUTION']
-    }
-  },
-  {
-    path: `${BASE_URL}/core/flower/?_=${Date.now()}`,
-    name: 'TaskMonitor',
-    // component: () => window.open(`/core/flower?_=${Date.now()}`),
-    meta: { title: i18n.t('route.TaskMonitor'), permissions: ['ops.view_taskmonitor'] }
-  }
-]
diff --git a/src/router/console/tasks.js b/src/router/console/tasks.js
new file mode 100644
index 000000000..a2bf48290
--- /dev/null
+++ b/src/router/console/tasks.js
@@ -0,0 +1,32 @@
+import i18n from '@/i18n/i18n'
+import { BASE_URL } from '@/utils/common'
+import empty from '@/layout/empty'
+
+export default [
+  {
+    path: 'tasks',
+    component: empty,
+    meta: { title: i18n.t('route.TaskList') },
+    children: [
+      {
+        path: '',
+        name: 'TaskList',
+        component: () => import('@/views/tasks/TaskList'),
+        meta: { title: i18n.t('route.TaskList'), permissions: [] }
+      },
+      {
+        path: ':id',
+        component: () => import('@/views/tasks/TaskDetail'),
+        name: 'TaskDetail',
+        hidden: true,
+        meta: { title: i18n.t('route.TaskDetail'), permissions: [] }
+      }
+    ]
+  },
+  {
+    path: `${BASE_URL}/core/flower/?_=${Date.now()}`,
+    name: 'TaskMonitor',
+    // component: () => window.open(`/core/flower?_=${Date.now()}`),
+    meta: { title: i18n.t('route.TaskMonitor'), permissions: ['ops.view_taskmonitor'] }
+  }
+]
diff --git a/src/router/workbench/index.js b/src/router/workbench/index.js
index e4d64545d..a7f0741aa 100644
--- a/src/router/workbench/index.js
+++ b/src/router/workbench/index.js
@@ -42,26 +42,7 @@ export default {
         permissions: ['perms.view_myassets']
       }
     },
-    {
-      path: '/workbench/ops',
-      component: empty,
-      meta: {
-        permissions: ['ops.add_commandexecution'],
-        hidden: ({ settings }) => !settings['SECURITY_COMMAND_EXECUTION']
-      },
-      children: [
-        {
-          path: '',
-          name: 'CommandExecutions',
-          component: () => import('@/views/ops/CommandExecution'),
-          meta: {
-            title: i18n.t('route.BatchCommand'),
-            icon: 'terminal',
-            permissions: ['ops.add_commandexecution']
-          }
-        }
-      ]
-    },
+
     {
       path: `external-luna`,
       component: empty,
@@ -97,6 +78,38 @@ export default {
           }
         }
       ]
+    },
+    {
+      path: '/workbench/ops',
+      component: empty,
+      name: 'JobCenter',
+      meta: {
+        title: i18n.t('route.JobCenter'),
+        icon: 'coffee',
+        permissions: []
+      },
+      children: [
+        {
+          path: 'a',
+          name: 'CommandExecutions2',
+          component: () => import('@/views/ops/Command'),
+          meta: {
+            title: i18n.t('route.BatchCommand'),
+            icon: 'terminal',
+            permissions: []
+          }
+        },
+        {
+          path: '',
+          name: 'CommandExecutions',
+          component: () => import('@/views/ops/Command'),
+          meta: {
+            title: i18n.t('route.BatchScript'),
+            icon: 'book',
+            permissions: []
+          }
+        }
+      ]
     }
   ]
 }
diff --git a/src/views/ops/Command.vue b/src/views/ops/Command.vue
new file mode 100644
index 000000000..617b48826
--- /dev/null
+++ b/src/views/ops/Command.vue
@@ -0,0 +1,13 @@
+<template>
+  <div />
+</template>
+
+<script>
+export default {
+  name: 'Command'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ops/CommandExecution.vue b/src/views/ops/CommandExecution.vue
deleted file mode 100644
index e7b25b0b0..000000000
--- a/src/views/ops/CommandExecution.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<template>
-  <Page>
-    <el-collapse-transition>
-      <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
-        <div v-show="iShowTree" :style="iShowTree?('width:250px;'):('width:0;')" class="transition-box">
-          <AutoDataZTree
-            ref="AutoDataZTree"
-            :key="DataZTree"
-            :setting="treeSetting"
-            class="auto-data-ztree"
-          />
-        </div>
-        <div :style="iShowTree?('display: flex;width: calc(100% - 250px);'):('display: flex;width:100%;')">
-          <div class="mini">
-            <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
-              <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
-            </div>
-          </div>
-          <IBox class="transition-box" style="width: calc(100% - 17px);">
-            <Term ref="xterm" />
-            <div style="display: flex;margin-top:10px;justify-content: space-between">
-              <div>
-                <CodeMirror :options="codeMirrorOptions" @change="handleActionChange" />
-              </div>
-              <div style="display: flex;flex-direction: column ;justify-content: space-between">
-                <el-select v-model="selectedSystemUser" :placeholder="this.$t('ops.PleaseSelect')" @change="handleSystemUserChange">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.id"
-                    :disabled="item.protocol !== 'ssh' || item.login_mode!== 'auto'"
-                    :label="`${item.name}(${item.username})`"
-                    :value="item.id"
-                  />
-                </el-select>
-                <el-button type="primary" size="small" @click="execute">{{ this.$t('ops.Execute') }}</el-button>
-              </div>
-            </div>
-          </IBox>
-        </div>
-      </div>
-    </el-collapse-transition>
-  </Page>
-</template>
-
-<script>
-import AutoDataZTree from '@/components/AutoDataZTree'
-import Term from '@/components/Term'
-import IBox from '@/components/IBox'
-import CodeMirror from '@/components/CodeMirror'
-import Page from '@/layout/components/Page'
-
-export default {
-  name: 'CommandExecution',
-  components: {
-    Term,
-    AutoDataZTree,
-    IBox,
-    Page,
-    CodeMirror
-  },
-  data() {
-    return {
-      DataZTree: 0,
-      codeMirrorOptions: {
-        lineNumbers: true,
-        lineWrapping: true,
-        mode: 'shell'
-      },
-      treeSetting: {
-        treeUrl: '',
-        showRefresh: true,
-        showMenu: false,
-        check: {
-          enable: true
-        },
-        view: {
-          dblClickExpand: false,
-          showLine: true
-        },
-        data: {
-          simpleData: {
-            enable: true
-          }
-        },
-        edit: {
-          enable: true,
-          showRemoveBtn: false,
-          showRenameBtn: false,
-          drag: {
-            isCopy: true,
-            isMove: true
-          }
-        },
-        callback: {
-          onCheck: this.onCheck.bind(this),
-          onClick: this.onClick.bind(this),
-          onSelected: this.onSelected.bind(this)
-        },
-        async: {
-          enable: false
-        }
-      },
-      iShowTree: true,
-      actions: '',
-      options: [],
-      selectedSystemUser: '',
-      basicUrl: '/api/v1/perms/users/nodes-with-assets/tree/?cache_policy=1',
-      ws: '',
-      wsConnected: false
-    }
-  },
-  computed: {
-    zTree() {
-      return this.$refs.AutoDataZTree.$refs.dataztree.$refs.ztree.zTree
-    },
-    xterm() {
-      return this.$refs.xterm.xterm
-    }
-  },
-  mounted() {
-    this.$axios.get('/api/v1/perms/system-users-permission/').then(res => {
-      if (res.length === 0) {
-        this.handleSystemUserChange('')
-        return
-      }
-      for (const i in res) {
-        // :disabled="item.protocol !== 'ssh'&& item.login_mode!=='auto'"
-        if (res[i].protocol === 'ssh' && res[i].login_mode === 'auto') {
-          this.handleSystemUserChange(res[i].id)
-          this.selectedSystemUser = res[i].id
-          break
-        }
-      }
-      this.options = res
-    })
-    this.xterm.write(this.$t('ops.selectAssetsMessage'))
-    this.enableWS()
-  },
-  methods: {
-    handleActionChange(val) {
-      this.actions = val
-    },
-    onClick(event, treeId, treeNode, clickFlag) {
-      // if (treeNode.meta.type === 'asset') {
-      //   const protocolsStr = treeNode.meta.data.protocols + ''
-      //   if (protocolsStr.indexOf('ssh/') === -1) {
-      //     // Don't Support SSH
-      //   }
-      // }
-    },
-    onSelected(event, treeNode) {
-
-    },
-    handleSystemUserChange(id) {
-      this.treeSetting.treeUrl = `${this.basicUrl}&system_user=${id}`
-      this.xterm.clear()
-      this.DataZTree++
-    },
-    getSelectedAssetsNode() {
-      const nodes = this.$refs.AutoDataZTree.$refs.dataztree.$refs.ztree.getCheckedNodes()
-      const assetsNodeId = []
-      const assetsNode = []
-      nodes.forEach(function(node) {
-        if (node.meta.type === 'asset' && !node.isHidden) {
-          const protocolsStr = node.meta.data.protocols + ''
-          if (assetsNodeId.indexOf(node.id) === -1 && protocolsStr.indexOf('ssh') > -1) {
-            assetsNodeId.push(node.id)
-            assetsNode.push(node)
-          }
-        }
-      })
-      return assetsNode
-    },
-    onCheck(e, treeId, treeNode) {
-      const nodes = this.getSelectedAssetsNode()
-      const nodes_names = nodes.map(function(node) {
-        return node.name
-      })
-      let message = this.$t('ops.selectedAssets')
-      message += nodes_names.join(', ')
-      message += '\r\n'
-      message += this.$t('ops.inTotal') + `：${nodes_names.length} \r\n`
-      this.xterm.clear()
-      this.xterm.write(message)
-    },
-    enableWS() {
-      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
-      const port = document.location.port ? ':' + document.location.port : ''
-      const url = '/ws/ops/tasks/log/'
-      const wsURL = scheme + '://' + document.location.hostname + port + url
-      // const failOverPort = '8070'
-      // const failOverWsURL = scheme + '://' + document.location.hostname + ':' + failOverPort + url
-      this.ws = new WebSocket(wsURL)
-      this.ws.onerror = (e) => {
-        this.xterm.write(this.wrapperError('Connect websocket server error'))
-      }
-      this.setWsCallback()
-    },
-    setWsCallback() {
-      this.ws.onmessage = (e) => {
-        const data = JSON.parse(e.data)
-        let message = data.message
-        message = message.replace(/Task ops\.tasks\.run_command_execution.*/, '')
-        this.xterm.write(message)
-      }
-    },
-    wrapperError(msg) {
-      return `\r\n${msg}\r\n`
-    },
-    writeExecutionOutput(taskId) {
-      let msg = this.$t('assets.Pending')
-      this.xterm.write(msg)
-      msg = JSON.stringify({ task: taskId })
-      this.ws.send(msg)
-    },
-    execute() {
-      const size = 'rows=' + this.xterm.rows + '&cols=' + this.xterm.cols
-      const url = '/api/v1/ops/command-executions/?' + size
-      const runAs = this.selectedSystemUser
-      const command = this.actions
-      const hosts = this.getSelectedAssetsNode().map(function(node) {
-        return node.id
-      })
-      if (hosts.length === 0) {
-        this.xterm.write(this.wrapperError(this.$t('assets.UnselectedAssets')))
-        return
-      }
-      if (!command) {
-        this.xterm.write(this.wrapperError(this.$t('assets.NoInputCommand')))
-        return
-      }
-      if (!runAs) {
-        this.xterm.write(this.wrapperError(this.$t('assets.NoSystemUserWasSelected')))
-        return
-      }
-      const data = {
-        hosts: hosts,
-        run_as: runAs,
-        command: command
-      }
-      this.$axios.post(
-        url, data
-      ).then(res => {
-        this.writeExecutionOutput(res.id)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .mini-button{
-    width: 12px;
-    float: right;
-    text-align: center;
-    padding: 5px 0;
-    background-color: var(--color-primary);
-    border-color: var(--color-primary);
-    color: #FFFFFF;
-    border-radius: 3px;
-  }
-  .el-tree{
-    background-color: inherit !important;
-  }
-  .mini{
-    margin-right: 5px;
-    width: 12px !important;
-  }
-
-  .auto-data-ztree {
-    overflow: auto;
-    /*border-right: solid 1px red;*/
-  }
-  .vue-codemirror-wrap  ::v-deep  .CodeMirror{
-    width: 600px;
-    height: 100px;
-    border: 1px solid #eee;
-  }
-</style>
diff --git a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue b/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
deleted file mode 100644
index ade036559..000000000
--- a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <el-row :gutter="20">
-    <el-col :md="14" :sm="24">
-      <DetailCard :title="cardTitle" :items="detailCardItems" />
-    </el-col>
-    <el-col :md="10" :sm="24">
-      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
-      <RunInfoCard type="info" v-bind="RunSuccessConfig" style="margin-top: 15px" />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import DetailCard from '@/components/DetailCard/index'
-import { toSafeLocalDateStr } from '@/utils/common'
-import RunInfoCard from '../../RunInfoCard'
-import { toLastFailureDisplay, toLastSucessDisplay } from '../business'
-
-export default {
-  name: 'AdhocDetail',
-  components: {
-    DetailCard,
-    RunInfoCard
-  },
-  props: {
-    object: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      RunSuccessConfig: {
-        icon: 'fa-info',
-        title: this.$t('ops.lastRunSuccessHosts'),
-        contents: toLastSucessDisplay(this.object.latest_execution)
-      },
-      RunFailedConfig: {
-        icon: 'fa-info',
-        title: this.$t('ops.lastRunFailedHosts'),
-        contents: toLastFailureDisplay(this.object.latest_execution)
-      }
-    }
-  },
-  computed: {
-    cardTitle() {
-      return `${this.object.task_name}: ${this.object.short_id}`
-    },
-    detailCardItems() {
-      return [
-        {
-          key: this.$t('ops.hosts'),
-          value: JSON.stringify(this.object.hosts.length)
-        },
-        {
-          key: this.$t('ops.pattern'),
-          value: this.object.pattern
-        },
-        {
-          key: this.$t('ops.options'),
-          value: this.disPlayOptions(this.object.options)
-          // value: this.object.options
-        },
-        {
-          key: this.$t('ops.runAs'),
-          value: this.disPlayRunAs(this.object.run_as_admin, this.object.run_as)
-        },
-        {
-          key: this.$t('ops.become'),
-          value: this.object.become_display
-        },
-        {
-          key: this.$t('common.createBy'),
-          value: this.object.created_by
-        },
-        {
-          key: this.$t('common.dateCreated'),
-          value: toSafeLocalDateStr(this.object.date_created)
-        },
-        {
-          key: this.$t('ops.runTimes'),
-          value: this.object.run_times
-        },
-        {
-          key: this.$t('ops.lastRun'),
-          value: this.object.latest_execution.last_run
-        },
-        {
-          key: this.$t('ops.timeDelta'),
-          value: this.object.latest_execution.timedelta
-        },
-        {
-          key: this.$t('ops.isFinished'),
-          value: this.object.latest_execution.is_finished
-        },
-        {
-          key: this.$t('ops.isSuccess'),
-          value: this.object.latest_execution.is_success
-        },
-        {
-          key: this.$t('ops.tasks'),
-          value: this.toContentsDisplay(this.object.tasks),
-          formatter(row, value) {
-            return (<div>{
-              value.map((content) => {
-                return <div>{ content }</div>
-              })}
-            </div>)
-          }
-        }
-      ]
-    }
-  },
-  methods: {
-    disPlayRunAs(run_as_admin, run_as) {
-      if (run_as_admin) {
-        return 'Admin'
-      }
-      return run_as
-    },
-    disPlayOptions(options) {
-      return options.replace(/:/g, '=').replace(/'/g, '').replace('{', '').replace('}', '')
-    },
-    toContentsDisplay(contents) {
-      const lines = []
-      for (let i = 0; i < contents.length; i++) {
-        const content = contents[i]
-        lines.push(`${i}. ${content.name} ::: ${content.action.module}`)
-      }
-      return lines
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
diff --git a/src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue b/src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
deleted file mode 100644
index 46413b8c0..000000000
--- a/src/views/ops/TaskDetail/AdhocDetail/AdhocExecutionHistory.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <ListTable :table-config="tableConfig" :header-actions="headerActions" />
-</template>
-
-<script>
-import ListTable from '@/components/ListTable'
-import { ActionsFormatter } from '@/components/TableFormatters'
-import { toSafeLocalDateStr } from '@/utils/common'
-
-export default {
-  name: 'AdhocExecutionHistory',
-  components: {
-    ListTable
-  },
-  data() {
-    return {
-      tableConfig: {
-        url: `/api/v1/ops/adhoc-executions/?adhoc=${this.$route.params.id}`,
-        columns: [
-          'date_start', 'stat', 'ratio', 'is_finished', 'is_success', 'timedelta', 'adhoc_short_id', 'actions'
-        ],
-        columnsMeta: {
-          date_start: {
-            formatter: function(row) {
-              return toSafeLocalDateStr(row.date_start)
-            }
-          },
-          stat: {
-            label: this.$t('ops.stat'),
-            align: 'center',
-            width: '100px',
-            formatter: function(row) {
-              const summary = <div>
-                <span class='text-primary'>{row.stat.success}</span>/
-                <span class='text-danger'>{row.stat.failed}</span>/
-                <span>{row.stat.total}</span>
-              </div>
-              return summary
-            }
-          },
-          ratio: {
-            label: this.$t('ops.ratio'),
-            align: 'center',
-            width: '80px',
-            formatter: function(row) {
-              const ratio = (row.stat.success / row.stat.total) * 100
-              if (ratio === 100) {
-                return <span class='text-navy'>{ratio + '%'}</span>
-              }
-              return <span class='text-danger'>{ratio + '%'}</span>
-            }
-          },
-          is_finished: {
-            align: 'center',
-            width: '100px',
-            label: this.$t('ops.isFinished')
-          },
-          is_success: {
-            align: 'center',
-            width: '100px',
-            label: this.$t('ops.isSuccess')
-          },
-          timedelta: {
-            label: this.$t('ops.time'),
-            width: '100px',
-            formatter: function(row) {
-              return row.timedelta.toFixed(2) + 's'
-            }
-          },
-          adhoc_short_id: {
-            label: this.$t('ops.version')
-          },
-          actions: {
-            prop: 'id',
-            formatter: ActionsFormatter,
-            formatterArgs: {
-              hasEdit: false,
-              hasDelete: false,
-              hasClone: false,
-              hasUpdate: false,
-              extraActions: [
-                {
-                  name: 'detail',
-                  title: this.$t('ops.detail'),
-                  type: 'primary',
-                  callback: function({ row, tableData }) {
-                    return this.$router.push({ name: 'HistoryExecutionDetail', params: { id: row.id }})
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasRightActions: false
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/ops/TaskDetail/AdhocDetail/index.vue b/src/views/ops/TaskDetail/AdhocDetail/index.vue
deleted file mode 100644
index 8b7e5f1e6..000000000
--- a/src/views/ops/TaskDetail/AdhocDetail/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <GenericDetailPage :object.sync="AdhocDetail" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
-    <keep-alive>
-      <component :is="config.activeMenu" :object="AdhocDetail" />
-    </keep-alive>
-  </GenericDetailPage>
-</template>
-
-<script>
-import { GenericDetailPage, TabPage } from '@/layout/components'
-import AdhocExecutionHistory from './AdhocExecutionHistory'
-import AdhocDetail from './AdhocDetail'
-
-export default {
-  components: {
-    GenericDetailPage,
-    AdhocExecutionHistory,
-    AdhocDetail,
-    TabPage
-  },
-  data() {
-    return {
-      AdhocDetail: {},
-      config: {
-        activeMenu: 'AdhocDetail',
-        title: this.$t('ops.taskDetail'),
-        submenu: [
-          {
-            title: this.$t('ops.versionDetail'),
-            name: 'AdhocDetail'
-          },
-          {
-            title: this.$t('ops.versionRunExecution'),
-            name: 'AdhocExecutionHistory',
-            hidden: () => !this.$hasPerm('ops.view_adhocexecution')
-          }
-        ],
-        hasRightSide: false
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/ops/TaskList.vue b/src/views/ops/TaskList.vue
deleted file mode 100644
index 493d58a43..000000000
--- a/src/views/ops/TaskList.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
-</template>
-
-<script type="text/jsx">
-// import { timeOffset, toSafeLocalDateStr } from '@/utils/common'
-import { GenericListPage } from '@/layout/components'
-// import { openTaskPage } from '@/utils/jms'
-
-export default {
-  components: {
-    GenericListPage
-  },
-  data() {
-    return {
-      tableConfig: {
-        url: '/api/v1/ops/tasks/',
-        columns: [
-          'name', 'queue', 'comment', 'count', 'state', 'last_published_time'
-        ],
-        columnsMeta: {
-          name: {
-            formatterArgs: {
-              can: true
-            }
-            // formatter: (row) => {
-            //   return row.meta.verbose_name != null ? row.meta.verbose_name : row.name
-            // }
-          },
-          comment: {
-            label: 'comment',
-            formatter: (row) => {
-              return row.meta.comment
-            }
-          },
-          queue: {
-            label: 'queue',
-            formatter: (row) => {
-              return row.meta.queue
-            }
-          },
-          last_published_time: {
-            width: '210px',
-            formatter: (row) => {
-              return row.last_published_time != null ? row.last_published_time : '-'
-            }
-          },
-          count: {
-            label: 'success/total',
-            width: '120px',
-            formatter: (row) => {
-              return <div>
-                <span Class='text-primary'>{row.success_count}</span>/
-                <span>{row.publish_count}</span>
-              </div>
-            }
-          },
-          state: {
-            width: '60px',
-            align: 'center',
-            formatter: (row) => {
-              switch (row.state) {
-                case 'green':
-                  return <i Class='fa  fa-circle-o text-primary' />
-                case 'yellow':
-                  return <i Class='fa fa-circle-o text-warning' />
-                case 'red':
-                  return <i Class='fa fa-circle-o text-danger' />
-              }
-            }
-          },
-          // runtimes: {
-          //   label: this.$t('ops.runTimes'),
-          //   width: '120px',
-          //   formatter: function(row) {
-          //     return (<div>
-          //       <span Class='text-primary'>{row.summary.success}</span>/
-          //       <span Class='text-danger'>{row.summary.failed}</span>/
-          //       <span>{row.summary.total}</span>
-          //     </div>)
-          //   }
-          // },
-          // host_amount: {
-          //   label: this.$t('ops.hosts'),
-          //   width: '65px',
-          //   formatter: function(row) {
-          //     return _.get(row, 'latest_execution.hosts_amount', 0)
-          //   }
-          // },
-          // is_success: {
-          //   label: this.$t('ops.success'),
-          //   align: 'center',
-          //   width: '80px',
-          //   formatter: row => {
-          //     if (_.get(row, 'latest_execution.is_success', false)) {
-          //       return <i Class='fa fa-check text-primary'/>
-          //     }
-          //     return <i Class='fa fa-times text-danger'/>
-          //   }
-          // },
-          // date_start: {
-          //   label: this.$t('ops.date'),
-          //   width: '150px',
-          //   formatter: function(row) {
-          //     if (_.get(row, 'latest_execution.date_start', false)) {
-          //       return toSafeLocalDateStr(row.latest_execution.date_start)
-          //     }
-          //     return ''
-          //   }
-          // },
-          // time: {
-          //   label: this.$t('ops.time'),
-          //   width: '100px',
-          //   formatter: function(row) {
-          //     if (_.get(row, 'latest_execution.date_start', false)) {
-          //       return timeOffset(row.latest_execution.date_start, row.latest_execution.date_finished)
-          //     }
-          //     return ''
-          //   }
-          // },
-          actions: {
-            prop: 'id',
-            formatterArgs: {
-              // hasUpdate: false,
-              // hasClone: false,
-              // canDelete: this.$hasPerm('ops.delete_task'),
-              // onDelete: function({ row, col, cellValue, reload }) {
-              //   const msg = this.$t('common.deleteWarningMsg') + ` "${row.display_name || row.name}" ` + '?'
-              //   const title = this.$t('common.Info')
-              //   this.$alert(msg, title, {
-              //     type: 'warning',
-              //     confirmButtonClass: 'el-button--danger',
-              //     showCancelButton: true,
-              //     beforeClose: async(action, instance, done) => {
-              //       if (action !== 'confirm') return done()
-              //       instance.confirmButtonLoading = true
-              //       try {
-              //         await performDelete.bind(this)({ row: row, col: col })
-              //         done()
-              //         reload()
-              //         this.$message.success(this.$t('common.deleteSuccessMsg'))
-              //       } finally {
-              //         instance.confirmButtonLoading = false
-              //       }
-              //     }
-              //   })
-              // },
-              // extraActions: [
-              //   {
-              //     name: 'run',
-              //     can: this.$hasPerm('ops.add_adhoc'),
-              //     title: this.$t('ops.run'),
-              //     type: 'primary',
-              //     callback: function({ row, tableData }) {
-              //       this.$axios.get(
-              //         `/api/v1/ops/tasks/${row.id}/run/`
-              //       ).then(res => {
-              //         openTaskPage(res['task'])
-              //       })
-              //     }
-              //   }
-              // ]
-            }
-          }
-        }
-      },
-      headerActions: {
-        hasRightActions: false,
-        hasCreate: false
-      }
-    }
-  },
-  methods: {}
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
diff --git a/src/views/ops/CeleryTaskLog.vue b/src/views/tasks/CeleryTaskLog.vue
similarity index 100%
rename from src/views/ops/CeleryTaskLog.vue
rename to src/views/tasks/CeleryTaskLog.vue
diff --git a/src/views/ops/RunInfoCard/index.vue b/src/views/tasks/RunInfoCard/index.vue
similarity index 100%
rename from src/views/ops/RunInfoCard/index.vue
rename to src/views/tasks/RunInfoCard/index.vue
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/tasks/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
similarity index 97%
rename from src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
rename to src/views/tasks/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index 80345f564..4c297b2ca 100644
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/tasks/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -13,7 +13,7 @@
 <script type="text/jsx">
 import DetailCard from '@/components/DetailCard'
 import { toSafeLocalDateStr } from '@/utils/common'
-import RunInfoCard from '../../RunInfoCard'
+import RunInfoCard from '../../../tasks/RunInfoCard'
 import { toLastFailureDisplay, toLastSucessDisplay } from '../business'
 import { openTaskPage } from '@/utils/jms'
 
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/index.vue b/src/views/tasks/TaskDetail/HistoryExecutionDetail/index.vue
similarity index 100%
rename from src/views/ops/TaskDetail/HistoryExecutionDetail/index.vue
rename to src/views/tasks/TaskDetail/HistoryExecutionDetail/index.vue
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/tasks/TaskDetail/TaskDetail.vue
similarity index 100%
rename from src/views/ops/TaskDetail/TaskDetail.vue
rename to src/views/tasks/TaskDetail/TaskDetail.vue
diff --git a/src/views/ops/TaskDetail/TaskHistory.vue b/src/views/tasks/TaskDetail/TaskHistory.vue
similarity index 96%
rename from src/views/ops/TaskDetail/TaskHistory.vue
rename to src/views/tasks/TaskDetail/TaskHistory.vue
index 0d07828c6..bad0abedb 100644
--- a/src/views/ops/TaskDetail/TaskHistory.vue
+++ b/src/views/tasks/TaskDetail/TaskHistory.vue
@@ -19,7 +19,7 @@ export default {
   data() {
     return {
       tableConfig: {
-        url: `/api/v1/ops/tasks/${this.object.id}/executions/`,
+        url: `/api/v1/ops/task-executions/?task_id=${this.object.id}`,
         columns: [
           'id', 'state', 'is_finished', 'date_published', 'date_start', 'date_finished', 'actions'
         ],
diff --git a/src/views/ops/TaskDetail/business.js b/src/views/tasks/TaskDetail/business.js
similarity index 100%
rename from src/views/ops/TaskDetail/business.js
rename to src/views/tasks/TaskDetail/business.js
diff --git a/src/views/ops/TaskDetail/index.vue b/src/views/tasks/TaskDetail/index.vue
similarity index 100%
rename from src/views/ops/TaskDetail/index.vue
rename to src/views/tasks/TaskDetail/index.vue
diff --git a/src/views/tasks/TaskList.vue b/src/views/tasks/TaskList.vue
new file mode 100644
index 000000000..d29af0f7f
--- /dev/null
+++ b/src/views/tasks/TaskList.vue
@@ -0,0 +1,81 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script type="text/jsx">
+import { GenericListPage } from '@/layout/components'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/ops/tasks/',
+        columns: [
+          'name', 'queue', 'comment', 'count', 'state', 'last_published_time'
+        ],
+        columnsMeta: {
+          name: {
+            formatterArgs: {
+              can: true
+            }
+          },
+          comment: {
+            label: 'comment',
+            formatter: (row) => {
+              return row.meta.comment
+            }
+          },
+          queue: {
+            label: 'queue',
+            formatter: (row) => {
+              return row.meta.queue
+            }
+          },
+          last_published_time: {
+            width: '210px',
+            formatter: (row) => {
+              return row.last_published_time != null ? row.last_published_time : '-'
+            }
+          },
+          count: {
+            label: 'success/total',
+            width: '120px',
+            formatter: (row) => {
+              return <div>
+                <span Class='text-primary'>{row.success_count}</span>/
+                <span>{row.publish_count}</span>
+              </div>
+            }
+          },
+          state: {
+            width: '60px',
+            align: 'center',
+            formatter: (row) => {
+              switch (row.state) {
+                case 'green':
+                  return <i Class='fa  fa-circle-o text-primary' />
+                case 'yellow':
+                  return <i Class='fa fa-circle-o text-warning' />
+                case 'red':
+                  return <i Class='fa fa-circle-o text-danger' />
+              }
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasRightActions: false,
+        hasLeftActions: false
+      }
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

From 855142661921da525d30e9f929f0acadfb500d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 28 Oct 2022 19:05:58 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E7=89=88=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                        |  5 ++
 src/i18n/langs/ja.json                        |  5 ++
 src/i18n/langs/zh.json                        |  5 ++
 src/router/console/accounts.js                | 48 ++++++++++
 .../AccountTemplateCreateUpdate.vue           | 34 +++++++
 .../AccountTemplateDetail/Detail.vue          | 90 +++++++++++++++++++
 .../AccountTemplateDetail/index.vue           | 43 +++++++++
 .../AccountTemplate/AccountTemplateList.vue   | 45 ++++++++++
 8 files changed, 275 insertions(+)
 create mode 100644 src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
 create mode 100644 src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
 create mode 100644 src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue
 create mode 100644 src/views/accounts/AccountTemplate/AccountTemplateList.vue

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index acb090810..365e25b38 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -95,6 +95,8 @@
   "assets": {
     "SelectTemplate": "Select template",
     "InAssetDetail": "Update account information in asset details",
+    "SecretType": "Secret type",
+    "PrivilegedTemplate": "Privileged",
     "All": "All",
     "CloudPlatform": "Cloud platform",
     "RecentlyUsed": "Recently used",
@@ -716,6 +718,9 @@
     "SessionDetail": "SessionDetail",
     "Accounts": "Accounts",
     "AssetAccount": "Asset Account",
+    "AccountTemplate": "Account template",
+    "CreateAccountTemplate": "Create account template",
+    "UpdateAccountTemplate": "Update account template",
     "AssetHistoryAccount": "Asset History Account",
     "ApplicationAccount": "Application Account",
     "Ticket": "Tickets",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 2e2e08223..4e51d27b1 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -100,6 +100,8 @@
   "assets": {
     "SelectTemplate": "テンプレートの選択",
     "InAssetDetail": "資産詳細でのアカウント情報の更新",
+    "SecretType": "機密タイプ",
+    "PrivilegedTemplate": "特権的",
     "All": "すべて",
     "CloudPlatform": "クラウドプラットフォーム",
     "RecentlyUsed": "最近使われる",
@@ -724,6 +726,9 @@
     "TicketFlowUpdate": "承認フローの更新",
     "Accounts": "アカウント管理",
     "AssetAccount": "資産アカウント",
+    "AccountTemplate": "アカウントテンプレート",
+    "CreateAccountTemplate": "アカウントテンプレートの作成",
+    "UpdateAccountTemplate": "アカウントテンプレートの更新",
     "AssetHistoryAccount": "資産履歴",
     "ApplicationAccount": "アプリアカウント",
     "Ticket": "ワークオーダー",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 58447e15f..1a71342a4 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -100,6 +100,8 @@
   "assets": {
     "SelectTemplate": "选择模版",
     "InAssetDetail": "在资产详情中更新账号信息",
+    "SecretType": "密文类型",
+    "PrivilegedTemplate": "特权的",
     "Address": "地址",
     "PrivateKey": "密钥",
     "Secret": "密码",
@@ -737,6 +739,9 @@
     "TicketFlowUpdate": "更新审批流",
     "Accounts": "账号管理",
     "AssetAccount": "资产账号",
+    "AccountTemplate": "账号模版",
+    "CreateAccountTemplate": "创建账号模版",
+    "UpdateAccountTemplate": "更新账号模版",
     "AssetHistoryAccount": "资产历史账号",
     "ApplicationAccount": "应用账号",
     "Ticket": "工单",
diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js
index a2eeab4d0..7d5c72f5e 100644
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -34,6 +34,54 @@ export default [
       }
     ]
   },
+  {
+    path: 'account-template',
+    component: empty,
+    meta: {
+      title: i18n.t('route.AccountTemplate'),
+      app: 'assets',
+      permissions: ['assets.view_accounttemplate']
+    },
+    redirect: '',
+    children: [
+      {
+        path: '',
+        name: 'AccountTemplateList',
+        component: () => import('@/views/accounts/AccountTemplate/AccountTemplateList'),
+        meta: {
+          title: i18n.t('route.AccountTemplate'),
+          permissions: ['assets.view_accounttemplate']
+        }
+      },
+      {
+        path: 'create',
+        component: () => import('@/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue'),
+        name: 'AccountTemplateCreate',
+        meta: {
+          title: i18n.t('route.CreateAccountTemplate'),
+          action: 'create'
+        },
+        hidden: true
+      },
+      {
+        path: ':id/update',
+        component: () => import('@/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue'),
+        name: 'AccountTemplateUpdate',
+        meta: {
+          title: i18n.t('route.UpdateAccountTemplate'),
+          action: 'update'
+        },
+        hidden: true
+      },
+      {
+        path: ':id',
+        component: () => import('@/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue'),
+        name: 'AccountTemplateDetail',
+        meta: { title: i18n.t('route.AccountTemplate') },
+        hidden: true
+      }
+    ]
+  },
   {
     path: 'gathered-user',
     component: empty,
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
new file mode 100644
index 000000000..483a6d260
--- /dev/null
+++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
@@ -0,0 +1,34 @@
+<template>
+  <GenericCreateUpdatePage v-bind="$data" />
+</template>
+
+<script>
+import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+
+export default {
+  name: 'GatewayCreateUpdate',
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    return {
+      initial: {},
+      url: '/api/v1/assets/account-templates/',
+      hasDetailInMsg: false,
+      fields: [
+        [this.$t('common.Basic'), ['name', 'username', 'privileged']],
+        [this.$t('assets.Secret'), ['secret_type', 'secret']],
+        [this.$t('common.Other'), ['comment']]
+      ],
+      fieldsMeta: {
+      },
+      createSuccessNextRoute: { name: 'AccountTemplateList' },
+      updateSuccessNextRoute: { name: 'AccountTemplateList' }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
new file mode 100644
index 000000000..7ecb95e0c
--- /dev/null
+++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-row :gutter="20">
+    <el-col :md="14" :sm="24">
+      <DetailCard :items="detailCardItems" />
+    </el-col>
+    <el-col :md="10" :sm="24">
+      <QuickActions type="primary" :actions="quickActions" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import DetailCard from '@/components/DetailCard'
+import QuickActions from '@/components/QuickActions'
+import { toSafeLocalDateStr } from '@/utils/common'
+
+export default {
+  name: 'Detail',
+  components: {
+    DetailCard,
+    QuickActions
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      quickActions: [
+        {
+          title: this.$t('assets.PrivilegedTemplate'),
+          type: 'switcher',
+          attrs: {
+            model: this.object?.privileged,
+            disabled: !this.$hasPerm('assets.change_accounttemplate')
+          },
+          callbacks: {
+            change: function(val) {
+              this.$axios.patch(
+                '/api/v1/assets/account-templates/',
+                { privileged: val }
+              ).then(res => {
+                this.$message.success(this.$t('common.updateSuccessMsg'))
+              }).catch(err => {
+                this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
+              })
+            }.bind(this)
+          }
+        }
+      ]
+    }
+  },
+  computed: {
+    detailCardItems() {
+      return [
+        {
+          key: this.$t('assets.Name'),
+          value: this.object.name
+        },
+        {
+          key: this.$t('users.Username'),
+          value: this.object.username
+        },
+        {
+          key: this.$t('assets.SecretType'),
+          value: this.object.secret_type
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateJoined'),
+          value: toSafeLocalDateStr(this.object.date_created)
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateUpdated'),
+          value: toSafeLocalDateStr(this.object.date_updated)
+        },
+        {
+          key: this.$t('assets.Comment'),
+          value: this.object.comment
+        }
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue
new file mode 100644
index 000000000..034698181
--- /dev/null
+++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <GenericDetailPage
+    :object.sync="object"
+    :active-menu.sync="config.activeMenu"
+    v-bind="config"
+    v-on="$listeners"
+  >
+    <keep-alive>
+      <component :is="config.activeMenu" :object="object" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage, TabPage } from '@/layout/components'
+import Detail from './Detail.vue'
+export default {
+  components: {
+    GenericDetailPage,
+    TabPage,
+    Detail
+  },
+  data() {
+    return {
+      object: {},
+      config: {
+        url: '/api/v1/assets/account-templates/',
+        activeMenu: 'Detail',
+        submenu: [
+          {
+            title: this.$t('common.BasicInfo'),
+            name: 'Detail'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateList.vue b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
new file mode 100644
index 000000000..0e43de0e7
--- /dev/null
+++ b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
@@ -0,0 +1,45 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+
+export default {
+  name: 'AccountBackupPlanList',
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/assets/account-templates/',
+        columns: ['name', 'username', 'privileged', 'actions'],
+        columnsShow: {
+          min: ['name', 'actions']
+        },
+        columnsMeta: {
+          privileged: {
+            width: '100px'
+          }
+        }
+      },
+      headerActions: {
+        hasRefresh: true,
+        hasExport: false,
+        hasImport: false,
+        hasMoreActions: false,
+        createRoute: () => {
+          return {
+            name: 'AccountTemplateCreate'
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 89de63edcd97527620f7f73694471ede54968381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 31 Oct 2022 17:05:30 +0800
Subject: [PATCH 4/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=B5=84=E4=BA=A7=E6=97=B6=E6=A8=A1=E7=89=88=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         |  2 +-
 src/components/AssetSelect/index.vue          |  2 +-
 .../TableFormatters/ShowKeyCopyFormatter.vue  |  4 +-
 .../AccountTemplateCreateUpdate.vue           | 20 ++++++
 .../AccountTemplateDetail/Detail.vue          |  4 +-
 .../components/AccountTemplateDialog.vue      | 66 ++++++++++++++++++-
 .../components/AssetAccounts.vue              |  4 +-
 7 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index d7f27c748..f47f6953e 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -32,7 +32,7 @@ export default {
       form: this.account || { },
       fields: [
         [this.$t('common.Basic'), ['name', 'username', 'privileged']],
-        [this.$t('assets.Secret'), ['secret_type', 'password', 'ssh_key', 'token', 'api_key', 'passphrase']],
+        [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'api_key', 'passphrase']],
         [this.$t('common.Other'), ['push_now', 'comment']]
       ],
       defaultPrivilegedAccounts: ['root', 'administrator'],
diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index a95af21e2..ab364b792 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -110,7 +110,7 @@ export default {
           {
             prop: 'protocols',
             formatter: function(row) {
-              return <span> {row.protocols.toString()} </span>
+              return <span> {row.protocols?.toString()} </span>
             },
             label: this.$t('assets.Protocols')
           }
diff --git a/src/components/TableFormatters/ShowKeyCopyFormatter.vue b/src/components/TableFormatters/ShowKeyCopyFormatter.vue
index 9d533ea9f..22e3ee307 100644
--- a/src/components/TableFormatters/ShowKeyCopyFormatter.vue
+++ b/src/components/TableFormatters/ShowKeyCopyFormatter.vue
@@ -32,7 +32,7 @@ export default {
     },
     cellValue: {
       type: [String, Number],
-      default: null
+      default: ''
     },
     hasShow: {
       type: Boolean,
@@ -56,7 +56,7 @@ export default {
   methods: {
     switchShowValue() {
       const value = this.value || this.cellValue
-      return '******' + value.replace(/[\s\S]/g, '')
+      return value ? '******' + value.replace(/[\s\S]/g, '') : ''
     },
     onShow() {
       const { currentValue, switchShowValue } = this
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
index 483a6d260..6dc04dbf7 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
@@ -21,10 +21,30 @@ export default {
         [this.$t('common.Other'), ['comment']]
       ],
       fieldsMeta: {
+        secret_type: {
+          on: {
+            change: this.secretTypeChange
+          }
+        },
+        secret: {
+          el: {
+            type: 'input',
+            rows: 4
+          }
+        }
       },
       createSuccessNextRoute: { name: 'AccountTemplateList' },
       updateSuccessNextRoute: { name: 'AccountTemplateList' }
     }
+  },
+  methods: {
+    secretTypeChange([value]) {
+      if (value !== 'password') {
+        this.$set(this.fieldsMeta.secret.el, 'type', 'textarea')
+      } else {
+        this.$set(this.fieldsMeta.secret.el, 'type', 'input')
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
index 7ecb95e0c..23f55bea9 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Detail.vue
@@ -31,7 +31,7 @@ export default {
       quickActions: [
         {
           title: this.$t('assets.PrivilegedTemplate'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             model: this.object?.privileged,
             disabled: !this.$hasPerm('assets.change_accounttemplate')
@@ -39,7 +39,7 @@ export default {
           callbacks: {
             change: function(val) {
               this.$axios.patch(
-                '/api/v1/assets/account-templates/',
+                `/api/v1/assets/account-templates/${this.object.id}/`,
                 { privileged: val }
               ).then(res => {
                 this.$message.success(this.$t('common.updateSuccessMsg'))
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
index a99731817..793fe2f0c 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
@@ -7,8 +7,21 @@
     width="70%"
     v-bind="$attrs"
     v-on="$listeners"
+    @confirm="handleConfirm"
+    @cancel="handleCancel"
   >
-    <AutoDataTable :config="tableConfig" />
+    <template>
+      <el-button
+        type="primary"
+        size="small"
+        style="margin-bottom: 10px;"
+        :disabled="!$hasPerm('assets.view_accounttemplate')"
+        @click="onAddClick"
+      >
+        {{ $t('common.Add') }}
+      </el-button>
+      <AutoDataTable :config="tableConfig" />
+    </template>
   </Dialog>
 </template>
 
@@ -25,17 +38,36 @@ export default {
     visible: {
       type: Boolean,
       default: false
+    },
+    accounts: {
+      type: Array,
+      default: () => ([])
     }
   },
   data() {
     return {
+      accountsSelected: [],
       tableConfig: {
         url: '/api/v1/assets/account-templates/',
-        columns: ['name', 'username', 'privileged', 'actions'],
+        columns: ['name', 'username', 'privileged'],
         columnsMeta: {
           privileged: {
             width: '100px'
           }
+        },
+        listeners: {
+          'toggle-row-selection': (isSelected, row) => {
+            if (isSelected) {
+              this.addRowToSelect(row)
+            } else {
+              this.removeRowToSelect(row)
+            }
+          }
+        },
+        theRowDefaultIsSelected: (row) => {
+          return this.accounts.some((account) => {
+            return account.id === row.id
+          })
         }
       }
     }
@@ -49,6 +81,36 @@ export default {
         this.$emit('update:visible', val)
       }
     }
+  },
+  methods: {
+    handleConfirm() {
+      this.iVisible = false
+      // 过滤掉添加里还没有id的账号
+      const hasIdAccounts = this.accounts.filter(i => i?.id)
+      const data = _.xorBy(hasIdAccounts, this.accountsSelected, 'id')
+      this.accounts.push(...data)
+    },
+    handleCancel() {
+      this.iVisible = false
+    },
+    onAddClick() {
+      this.$router.push({ name: 'AccountTemplateList' })
+    },
+    hasSelectValue(row) {
+      return this.accountsSelected.some(item => item.id === row.id)
+    },
+    addRowToSelect(row) {
+      const hasSelectValue = this.hasSelectValue(row)
+      if (!hasSelectValue) {
+        this.accountsSelected.push(row)
+      }
+    },
+    removeRowToSelect(row) {
+      const hasSelectValue = this.hasSelectValue(row)
+      if (hasSelectValue) {
+        this.accountsSelected.splice(hasSelectValue, 1)
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
index b66788bdd..843d744b5 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
@@ -31,7 +31,9 @@
         :accounts="accounts"
       />
       <AccountTemplateDialog
+        v-if="templateDialogVisible"
         :visible.sync="templateDialogVisible"
+        :accounts="accounts"
       />
     </div>
   </div>
@@ -88,7 +90,7 @@ export default {
   methods: {
     removeAccount(account) {
       this.accounts = this.accounts.filter((item) => {
-        return item._id !== account._id
+        return item.id !== account.id
       })
     },
     onEditClick(account) {

From f5cc891cc4a8b639d4edde90e5dcbdc54ca87d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 31 Oct 2022 17:26:29 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/PasswordHistoryDialog.vue | 2 +-
 src/components/AccountListTable/index.vue                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AccountListTable/PasswordHistoryDialog.vue b/src/components/AccountListTable/PasswordHistoryDialog.vue
index eb66af16e..0f2827334 100644
--- a/src/components/AccountListTable/PasswordHistoryDialog.vue
+++ b/src/components/AccountListTable/PasswordHistoryDialog.vue
@@ -26,7 +26,7 @@ export default {
         visible: false,
         width: '60%',
         tableConfig: {
-          url: `/api/v1/assets/accounts-historys?id=${this.account.id}`,
+          url: `/api/v1/assets/${this.account.id}/histories/`,
           columns: [
             'name', 'version', 'password', 'date_created'
           ],
diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 73f5b53f8..71cf48eb3 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -188,7 +188,7 @@ export default {
                 },
                 {
                   title: this.$t('accounts.HistoryPassword'),
-                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
+                  can: this.$hasPerm('assets.view_accountsecret') && !this.$store.getters.currentOrgIsRoot,
                   callback: ({ row }) => {
                     vm.account = row
                     vm.showPasswordHistoryDialog = false
@@ -207,7 +207,7 @@ export default {
         hasMoreActions: true,
         hasCreate: false,
         hasImport: true,
-        hasExport: this.$hasPerm('assets.view_assetaccountsecret'),
+        hasExport: this.$hasPerm('assets.view_account'),
         exportOptions: {
           url: this.exportUrl,
           mfaVerifyRequired: true

From c03b08e8f29fd1ba43dc35657260ffd9c0bb5693 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 31 Oct 2022 17:37:21 +0800
Subject: [PATCH 6/9] perf: history secret

---
 src/components/AccountListTable/PasswordHistoryDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AccountListTable/PasswordHistoryDialog.vue b/src/components/AccountListTable/PasswordHistoryDialog.vue
index 0f2827334..ced686122 100644
--- a/src/components/AccountListTable/PasswordHistoryDialog.vue
+++ b/src/components/AccountListTable/PasswordHistoryDialog.vue
@@ -26,7 +26,7 @@ export default {
         visible: false,
         width: '60%',
         tableConfig: {
-          url: `/api/v1/assets/${this.account.id}/histories/`,
+          url: `/api/v1/assets/account-secrets/${this.account.id}/histories/`,
           columns: [
             'name', 'version', 'password', 'date_created'
           ],

From 85abb5937cac307aef58ef8284c29ec1626aa214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 31 Oct 2022 19:27:46 +0800
Subject: [PATCH 7/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E7=89=88=E5=88=9B=E5=BB=BA=E3=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         |  2 +-
 .../AccountTemplateCreateUpdate.vue           | 47 +++++++++++++------
 .../BaseAssetCreateUpdate.vue                 |  8 +++-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index f47f6953e..31b25683b 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -58,7 +58,7 @@ export default {
             }
           }
         },
-        password: {
+        secret: {
           label: this.$t('assets.Password'),
           component: UpdateToken,
           hidden: (formValue) => formValue.secret_type !== 'password'
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
index 6dc04dbf7..e19b5286a 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import { UpdateToken } from '@/components/FormFields'
 
 export default {
   name: 'GatewayCreateUpdate',
@@ -17,34 +18,50 @@ export default {
       hasDetailInMsg: false,
       fields: [
         [this.$t('common.Basic'), ['name', 'username', 'privileged']],
-        [this.$t('assets.Secret'), ['secret_type', 'secret']],
+        [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'access_key', 'passphrase']],
         [this.$t('common.Other'), ['comment']]
       ],
       fieldsMeta: {
         secret_type: {
-          on: {
-            change: this.secretTypeChange
-          }
         },
         secret: {
+          label: this.$t('assets.Password'),
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'password'
+        },
+        ssh_key: {
+          label: this.$t('assets.PrivateKey'),
           el: {
-            type: 'input',
+            type: 'textarea',
             rows: 4
-          }
+          },
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        passphrase: {
+          label: 'Passphrase',
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        token: {
+          label: 'Token',
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'token'
+        },
+        access_key: {
+          label: 'access key',
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'access_key'
         }
       },
       createSuccessNextRoute: { name: 'AccountTemplateList' },
       updateSuccessNextRoute: { name: 'AccountTemplateList' }
     }
-  },
-  methods: {
-    secretTypeChange([value]) {
-      if (value !== 'password') {
-        this.$set(this.fieldsMeta.secret.el, 'type', 'textarea')
-      } else {
-        this.$set(this.fieldsMeta.secret.el, 'type', 'input')
-      }
-    }
   }
 }
 </script>
diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index 604b8f4fb..17f1cb421 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -50,7 +50,13 @@ export default {
           [this.$t('assets.Label'), ['labels']],
           [this.$t('common.Other'), ['is_active', 'comment']]
         ],
-        fieldsMeta: assetFieldsMeta(this)
+        fieldsMeta: assetFieldsMeta(this),
+        cleanFormValue(values) {
+          const { id = '' } = this.$route.params
+          if (id) delete values['accounts']
+
+          return values
+        }
       }
     }
   },

From 91f6fe39658bbebf8e37ac726e38674e73142fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 31 Oct 2022 19:57:11 +0800
Subject: [PATCH 8/9] perf: component UpdateToken

---
 src/components/FormFields/UpdateToken.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/FormFields/UpdateToken.vue b/src/components/FormFields/UpdateToken.vue
index d0cdf7e70..aacb38c1c 100644
--- a/src/components/FormFields/UpdateToken.vue
+++ b/src/components/FormFields/UpdateToken.vue
@@ -32,6 +32,10 @@ export default {
         return this.$t('common.Update')
       }
     },
+    showInput: {
+      type: Boolean,
+      default: true
+    },
     placeholder: {
       type: String,
       default: () => ''
@@ -39,13 +43,13 @@ export default {
   },
   data() {
     return {
-      isShow: false,
+      isShow: this.showInput,
       curValue: this.value
     }
   },
   created() {
-    if (this.$route.path.indexOf('/create') !== -1) {
-      this.isShow = true
+    if (this.$route.path.indexOf('/update') !== -1) {
+      this.isShow = false
     }
   },
   methods: {

From 97f708b9ef4b344d58bca0b78f3e8f18a0011bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 31 Oct 2022 20:02:51 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/acl/UserLoginACL/UserDetail/Detail.vue            | 2 +-
 src/views/assets/Asset/AssetDetail/Detail.vue               | 2 +-
 src/views/assets/Platform/PlatformDetail/Detail.vue         | 2 +-
 .../AppliactionPermissionDetail.vue                         | 2 +-
 .../AssetPermissionDetail/AssetPermissionDetail.vue         | 2 +-
 src/views/profile/ProfileInfo.vue                           | 6 +++---
 .../settings/Applet/AppletHosts/AppletHostDetail/Detail.vue | 2 +-
 src/views/users/User/UserDetail/UserInfo.vue                | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/acl/UserLoginACL/UserDetail/Detail.vue b/src/views/acl/UserLoginACL/UserDetail/Detail.vue
index c2c9c69b3..4256d9f97 100644
--- a/src/views/acl/UserLoginACL/UserDetail/Detail.vue
+++ b/src/views/acl/UserLoginACL/UserDetail/Detail.vue
@@ -55,7 +55,7 @@ export default {
       quickActions: [
         {
           title: this.$t('common.Active'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             model: this.object.is_active
           },
diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue
index 61e8d1957..28892298b 100644
--- a/src/views/assets/Asset/AssetDetail/Detail.vue
+++ b/src/views/assets/Asset/AssetDetail/Detail.vue
@@ -39,7 +39,7 @@ export default {
       quickActions: [
         {
           title: this.$t('assets.IsActive'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             label: this.$t('common.Test'),
             model: this.object.is_active,
diff --git a/src/views/assets/Platform/PlatformDetail/Detail.vue b/src/views/assets/Platform/PlatformDetail/Detail.vue
index eba97ba5d..42dcbf785 100644
--- a/src/views/assets/Platform/PlatformDetail/Detail.vue
+++ b/src/views/assets/Platform/PlatformDetail/Detail.vue
@@ -79,7 +79,7 @@ export default {
       const quickActions = [
         {
           title: this.$t('assets.DomainEnabled'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             label: this.$t('common.Update'),
             model: object['domain_enabled'],
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/AppliactionPermissionDetail.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/AppliactionPermissionDetail.vue
index b4b498a57..e4357c552 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/AppliactionPermissionDetail.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/AppliactionPermissionDetail.vue
@@ -31,7 +31,7 @@ export default {
       quickActions: [
         {
           title: this.$t('common.Active'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             model: this.object.is_active,
             disabled: !this.$hasPerm('perms.change_applicationpermission')
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
index 8bb35ec48..7adae44ca 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
@@ -32,7 +32,7 @@ export default {
       quickActions: [
         {
           title: this.$t('common.Active'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             model: this.object.is_active,
             disabled: !this.$hasPerm('perms.change_assetpermission')
diff --git a/src/views/profile/ProfileInfo.vue b/src/views/profile/ProfileInfo.vue
index 2fc36f842..6c962795e 100644
--- a/src/views/profile/ProfileInfo.vue
+++ b/src/views/profile/ProfileInfo.vue
@@ -179,7 +179,7 @@ export default {
         },
         {
           title: this.$t('setting.WeCom'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             name: 'wecom',
             model: this.object.receive_backends.indexOf('wecom') !== -1
@@ -191,7 +191,7 @@ export default {
         },
         {
           title: this.$t('setting.DingTalk'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             name: 'dingtalk',
             model: this.object.receive_backends.indexOf('dingtalk') !== -1
@@ -203,7 +203,7 @@ export default {
         },
         {
           title: this.$t('setting.FeiShu'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             name: 'feishu',
             model: this.object.receive_backends.indexOf('feishu') !== -1
diff --git a/src/views/settings/Applet/AppletHosts/AppletHostDetail/Detail.vue b/src/views/settings/Applet/AppletHosts/AppletHostDetail/Detail.vue
index 4b35c6585..288e7c684 100644
--- a/src/views/settings/Applet/AppletHosts/AppletHostDetail/Detail.vue
+++ b/src/views/settings/Applet/AppletHosts/AppletHostDetail/Detail.vue
@@ -33,7 +33,7 @@ export default {
       quickActions: [
         {
           title: this.$t('assets.IsActive'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             label: this.$t('common.Test'),
             model: this.object.is_active,
diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index 997f387db..48ea464c3 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -35,7 +35,7 @@ export default {
       quickActions: [
         {
           title: this.$t('common.Activate'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             model: this.object.is_active,
             disabled: !vm.$hasPerm('users.change_user')