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