From 0921ebbc990705529b28201212f30a36f985ee14 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Mon, 25 May 2020 18:43:46 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2-?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=88=97=E8=A1=A8-=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=881=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  5 +-
 .../components/GenericDetailPage/index.vue    |  2 +
 .../ChangeAuthPlanExecutionInfo.vue           | 63 +++++++++++++++++++
 .../ChangeAuthPlanExecutionTaskList.vue       | 18 +++++-
 .../ChangeAuthPlanExecutionDetail/index.vue   | 54 ++++++++++++++++
 .../ChangeAuthPlanExecutionList.vue           |  4 +-
 .../ChangeAuthPlan/ChangeAuthPlanList.vue     |  3 +
 src/views/xpack/router.js                     |  8 +--
 8 files changed, 148 insertions(+), 9 deletions(-)
 create mode 100644 src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
 create mode 100644 src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 319d4e4ab..506bb901b 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -652,6 +652,8 @@
       "ChangeAuthPlanUpdate": "更新改密计划",
       "ChangeAuthPlanDetail": "改密计划详情",
       "ExecutionList": "执行列表",
+      "ExecutionDetail": "执行详情",
+      "TaskList": "任务列表",
       "Name": "名称",
       "Username": "用户名",
       "PasswordStrategy": "密码策略",
@@ -665,7 +667,8 @@
       "addAsset": "添加资产",
       "addNode": "添加节点",
       "Result": "结果",
-      "timeDelta": "运行时间",
+      "TimeDelta": "运行时间",
+      "DateStart": "开始日期",
       "Detail": "详情",
       "Log": "日志"
     },
diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index 194c33681..edbc9c745 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -97,6 +97,7 @@ export default {
           name: 'update',
           title: this.$t('common.Update'),
           can: this.validActions.canUpdate,
+          has: this.validActions.hasUpdate,
           callback: this.validActions.updateCallback.bind(this)
         },
         {
@@ -105,6 +106,7 @@ export default {
           type: 'danger',
           plain: true,
           can: this.validActions.canDelete,
+          has: this.validActions.hasDelete,
           callback: this.validActions.deleteCallback.bind(this)
         }
       ]
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
new file mode 100644
index 000000000..5c7329ac5
--- /dev/null
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
@@ -0,0 +1,63 @@
+<template>
+  <el-row :gutter="20">
+    <el-col :md="14" :sm="24">
+      <DetailCard :items="detailItems" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import DetailCard from '@/components/DetailCard'
+
+export default {
+  name: 'ChangeAuthPlanExecutionInfo',
+  components: {
+    DetailCard
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  computed: {
+    detailItems() {
+      return [
+        {
+          key: this.$t('xpack.ChangeAuthPlan.Username'),
+          value: this.object.username
+        },
+        {
+          key: this.$t('xpack.Asset'),
+          value: this.object.assets_amount
+        },
+        {
+          key: this.$t('xpack.Node'),
+          value: this.object.nodes_amount
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.PasswordStrategy'),
+          value: this.object.password_strategy_display
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
+          value: this.object.timedelta.toFixed(2) + 's'
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateStart'),
+          value: this.object.date_start
+        }
+
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
index b6c30a022..35cc65716 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
@@ -1,10 +1,24 @@
 <template>
-  <div>change auth plan execution task list</div>
+  <ListTable :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
+import ListTable from '@/components/ListTable'
+
 export default {
-  name: 'ChangeAuthPlanExecutionTaskList'
+  name: 'ChangeAuthPlanExecutionTaskList',
+  components: {
+    ListTable
+  },
+  data() {
+    return {
+      tableConfig: {
+
+      },
+      headerActions: {
+      }
+    }
+  }
 }
 </script>
 
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue
new file mode 100644
index 000000000..076ef1a6e
--- /dev/null
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <GenericDetailPage :object.sync="execution" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
+    <keep-alive>
+      <component :is="config.activeMenu" :object="execution" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage } from '@/layout/components'
+import ChangeAuthPlanExecutionInfo from './ChangeAuthPlanExecutionInfo'
+import ChangeAuthPlanExecutionTaskList from './ChangeAuthPlanExecutionTaskList'
+
+export default {
+  components: {
+    GenericDetailPage,
+    ChangeAuthPlanExecutionInfo,
+    ChangeAuthPlanExecutionTaskList
+  },
+  data() {
+    return {
+      execution: { id: '' },
+      config: {
+        activeMenu: 'ChangeAuthPlanExecutionInfo',
+        actions: {
+          hasUpdate: false,
+          hasDelete: false
+        },
+        submenu: [
+          {
+            title: this.$t('common.BasicInfo'),
+            name: 'ChangeAuthPlanExecutionInfo'
+          },
+          {
+            title: this.$t('xpack.ChangeAuthPlan.TaskList'),
+            name: 'ChangeAuthPlanExecutionTaskList'
+          }
+        ],
+        getTitle: this.getExecutionTitle
+
+      }
+    }
+  },
+  methods: {
+    getExecutionTitle() {
+      return `${this.$route.meta.title}: ${this.execution.id}`
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
index 17818c3de..890cf5210 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
@@ -50,7 +50,7 @@ export default {
             label: this.$t('xpack.ChangeAuthPlan.PasswordStrategy')
           },
           timedelta: {
-            label: this.$t('xpack.ChangeAuthPlan.timeDelta'),
+            label: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
             formatter: function(row) {
               return row.timedelta.toFixed(2) + 's'
             }
@@ -76,7 +76,7 @@ export default {
                 title: this.$t('xpack.ChangeAuthPlan.Detail'),
                 type: 'info',
                 callback: function({ cellValue, tableData }) {
-                  return this.$router.push({ name: 'ChangeAuthPlanExecutionTaskList', params: { id: cellValue }})
+                  return this.$router.push({ name: 'ChangeAuthPlanExecutionDetail', params: { id: cellValue }})
                 }
               }
             ]
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
index a4eb53595..bd35b1d21 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
@@ -29,6 +29,9 @@ export default {
           },
           nodes_amount: {
             label: vm.$t('xpack.Node')
+          },
+          periodic_display: {
+            showOverflowTooltip: true
           }
         },
         actions: {
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index ba13389a5..b3dfc0fa9 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -110,10 +110,10 @@ export default {
           hidden: true
         },
         {
-          path: 'plan/:id/execution/task',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue'),
-          name: 'ChangeAuthPlanExecutionTaskList',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlanExecutionTask'), activeMenu: '/xpack/change-auth-plan' },
+          path: 'plan-execution/:id',
+          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue'),
+          name: 'ChangeAuthPlanExecutionDetail',
+          meta: { title: i18n.t('xpack.ChangeAuthPlan.ExecutionDetail'), activeMenu: '/xpack/change-auth-plan' },
           hidden: true
         }
       ]