From 015209443cf06d220d0b6bcb680f87b6cac25684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 18:36:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92-=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=B5=84=E4=BA=A7=E7=A9=BA=E7=99=BD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeAuthPlanExecutionTaskList.vue       | 19 +++++++++++++++----
 .../ChangeAuthPlanExecutionList.vue           |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
index fb09d72b4..d65bb1757 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericListTable from '@/layout/components/GenericListTable'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'ChangeAuthPlanExecutionTaskList',
@@ -18,6 +19,7 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       tableConfig: {
         url: `/api/v1/xpack/change-auth-plan/plan-execution-subtask/?plan_execution_id=${this.object.id}`,
@@ -27,9 +29,18 @@ export default {
         columnsMeta: {
           asset: {
             label: this.$t('xpack.ChangeAuthPlan.Asset'),
-            formatter: function(row, column, cellValue, index) {
-              const url = `/assets/assets/${cellValue}`
-              return <router-link to={ url } >{ row.asset_info.hostname }</router-link>
+            formatter: DetailFormatter,
+            formatterArgs: {
+              can: this.$hasPerm('assets.view_asset'),
+              getTitle({ row }) {
+                return row.asset_info.hostname
+              },
+              getRoute({ row }) {
+                return {
+                  name: 'AssetDetail',
+                  params: { id: row.asset }
+                }
+              }
             }
           },
           is_success: {
@@ -54,8 +65,8 @@ export default {
                 {
                   name: 'retry',
                   type: 'info',
-                  can: this.$hasPerm('xpack.change_changeauthplantask'),
                   title: this.$t('xpack.ChangeAuthPlan.Retry'),
+                  can: vm.$hasPerm('xpack.change_changeauthplantask'),
                   callback: function({ row, tableData }) {
                     this.$axios.put(
                       `/api/v1/xpack/change-auth-plan/plan-execution-subtask/${row.id}/`,
diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
index 918fb0351..49cb569ac 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
@@ -83,6 +83,7 @@ export default {
                   name: 'detail',
                   title: this.$t('xpack.ChangeAuthPlan.Detail'),
                   type: 'info',
+                  can: this.$hasPerm('xpack.view_changeauthplantask'),
                   callback: function({ row }) {
                     return this.$router.push({ name: 'ChangeAuthPlanExecutionDetail', params: { id: row.id }})
                   }