From dfd710daf7e437089b7d8a0673b09fa2b10646ff Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 22 Jul 2021 13:33:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=89=93=E5=BC=80tas?=
 =?UTF-8?q?k=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/index.vue          |  3 ++-
 src/utils/jms.js                                   |  3 +++
 .../accounts/ChangeAuthPlan/ChangeAuthPlanList.vue |  3 ++-
 src/views/accounts/GatheredUser/TaskList.vue       |  3 ++-
 src/views/assets/Asset/AssetDetail/Account.vue     |  3 ++-
 src/views/assets/Asset/AssetDetail/Detail.vue      |  5 +++--
 src/views/assets/Asset/AssetDetail/SystemUser.vue  | 13 +++++++------
 src/views/assets/Asset/AssetList.vue               |  7 ++++---
 .../SystemUser/SystemUserDetail/AssetList.vue      | 14 +++++++-------
 .../HistoryExecutionDetail.vue                     |  3 ++-
 src/views/ops/TaskDetail/TaskDetail.vue            |  3 ++-
 src/views/ops/TaskList.vue                         |  3 ++-
 .../SyncInstanceTaskDetail/HistoryList.vue         |  3 ++-
 .../SyncInstanceTaskDetail/detail.vue              |  3 ++-
 .../SyncInstanceTask/SyncInstanceTaskList.vue      |  3 ++-
 15 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 src/utils/jms.js

diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index bb426535d..ac4a028ee 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -12,6 +12,7 @@ import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/component
 import ShowSecretInfo from './ShowSecretInfo'
 import UpdateSecretInfo from './UpdateSecretInfo'
 import { connectivityMeta } from './const'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'Detail',
@@ -123,7 +124,7 @@ export default {
                       `/api/v1/assets/accounts/${row.id}/verify/`,
                       { action: 'test' }
                     ).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(res['task'])
                     })
                   }
                 },
diff --git a/src/utils/jms.js b/src/utils/jms.js
new file mode 100644
index 000000000..f3b67b60e
--- /dev/null
+++ b/src/utils/jms.js
@@ -0,0 +1,3 @@
+export function openTaskPage(taskId) {
+  window.open(`/#/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
+}
diff --git a/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue
index b0f2874a1..e4c5c5dcb 100644
--- a/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue
+++ b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue
@@ -5,6 +5,7 @@
 <script>
 import { GenericListPage } from '@/layout/components'
 import { DetailFormatter } from '@/components/TableFormatters'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'ChangeAuthPlanList',
@@ -73,7 +74,7 @@ export default {
                       `/api/v1/xpack/change-auth-plan/plan-execution/`,
                       { plan: row.id }
                     ).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+                      openTaskPage(res['task'])
                     })
                   }.bind(this)
                 }
diff --git a/src/views/accounts/GatheredUser/TaskList.vue b/src/views/accounts/GatheredUser/TaskList.vue
index e35c6ac32..5dca90170 100644
--- a/src/views/accounts/GatheredUser/TaskList.vue
+++ b/src/views/accounts/GatheredUser/TaskList.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericListTable from '@/layout/components/GenericListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   components: {
@@ -65,7 +66,7 @@ export default {
                       `/api/v1/xpack/gathered-user/task-executions/`,
                       { task: data.row.id }
                     ).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+                      openTaskPage(res['task'])
                     }).catch(res => {
                     })
                   }
diff --git a/src/views/assets/Asset/AssetDetail/Account.vue b/src/views/assets/Asset/AssetDetail/Account.vue
index ce0606070..133de6a75 100644
--- a/src/views/assets/Asset/AssetDetail/Account.vue
+++ b/src/views/assets/Asset/AssetDetail/Account.vue
@@ -14,6 +14,7 @@
 <script>
 import QuickActions from '@/components/QuickActions'
 import { AccountListTable } from '@/components'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'Detail',
@@ -43,7 +44,7 @@ export default {
                 `/api/v1/assets/accounts/tasks/?asset=${this.object.id}`,
                 { action: 'test' }
               ).then(res => {
-                window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(res['task'])
               }
               )
             }.bind(this)
diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue
index 6adb7dcc8..428d87ce8 100644
--- a/src/views/assets/Asset/AssetDetail/Detail.vue
+++ b/src/views/assets/Asset/AssetDetail/Detail.vue
@@ -17,6 +17,7 @@ import RelationCard from '@/components/RelationCard'
 import QuickActions from '@/components/QuickActions'
 import LabelCard from './components/LabelCard'
 import { toSafeLocalDateStr } from '@/utils/common'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'Detail',
@@ -67,7 +68,7 @@ export default {
                 `/api/v1/assets/assets/${this.object.id}/tasks/`,
                 { action: 'refresh' }
               ).then(res => {
-                window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(res['task'])
               }
               )
             }.bind(this)
@@ -85,7 +86,7 @@ export default {
                 `/api/v1/assets/assets/${this.object.id}/tasks/`,
                 { action: 'test' }
               ).then(res => {
-                window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(res['task'])
               }
               )
             }.bind(this)
diff --git a/src/views/assets/Asset/AssetDetail/SystemUser.vue b/src/views/assets/Asset/AssetDetail/SystemUser.vue
index 0b8423770..1d7bf8797 100644
--- a/src/views/assets/Asset/AssetDetail/SystemUser.vue
+++ b/src/views/assets/Asset/AssetDetail/SystemUser.vue
@@ -18,6 +18,7 @@ import RelationCard from '@/components/RelationCard'
 import ListTable from '@/components/ListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
 import { connectivityMeta } from '@/components/AccountListTable/const'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'SystemUserList',
@@ -68,7 +69,7 @@ export default {
                     const theUrl = `/api/v1/assets/system-users/${row.systemuser}/tasks/`
                     const data = { action: 'test', assets: [this.object.id] }
                     this.$axios.post(theUrl, data).then(resp => {
-                      window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(resp['task'])
                     })
                   }
                 },
@@ -80,7 +81,7 @@ export default {
                     const theUrl = `/api/v1/assets/system-users/${row.systemuser}/tasks/`
                     const data = { action: 'push', assets: [this.object.id] }
                     this.$axios.post(theUrl, data).then(resp => {
-                      window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(resp['task'])
                     })
                   }
                 },
@@ -136,7 +137,7 @@ export default {
               const theUrl = `/api/v1/assets/assets/${this.object.id}/tasks/`
               const data = { action: 'test_system_user' }
               this.$axios.post(theUrl, data).then(resp => {
-                window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(resp['task'])
               })
             }.bind(this)
           }
@@ -152,7 +153,7 @@ export default {
               const theUrl = `/api/v1/assets/assets/${this.object.id}/tasks/`
               const data = { action: 'push_system_user' }
               this.$axios.post(theUrl, data).then(resp => {
-                window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(resp['task'])
               })
             }.bind(this)
           }
@@ -194,7 +195,7 @@ export default {
       })
       const data = { action: 'push_system_user', system_users: systemUsers }
       this.$axios.post(theUrl, data).then(resp => {
-        window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+        openTaskPage(resp['task'])
       })
     },
     bulkTestCallback({ selectedRows }) {
@@ -204,7 +205,7 @@ export default {
       })
       const data = { action: 'test_system_user', system_users: systemUsers }
       this.$axios.post(theUrl, data).then(resp => {
-        window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+        openTaskPage(resp['task'])
       })
     }
   }
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index c05245eb8..862d374f3 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -76,6 +76,7 @@ import rules from '@/components/DataForm/rules'
 import Protocols from '@/views/assets/Asset/components/Protocols/index'
 import { mapGetters } from 'vuex'
 import { connectivityMeta } from '@/components/AccountListTable/const'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   components: {
@@ -418,7 +419,7 @@ export default {
         `/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
         { 'action': 'refresh' }
       ).then((res) => {
-        window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+        openTaskPage(res['task'])
       }).catch(error => {
         this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
       })
@@ -433,7 +434,7 @@ export default {
         `/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
         { 'action': 'test' }
       ).then((res) => {
-        window.open(`/core/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+        openTaskPage(res['task'])
       }).catch(error => {
         this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
       })
@@ -484,7 +485,7 @@ export default {
       this.$axios.post(
         `/api/v1/assets/nodes/check_assets_amount_task/`
       ).then(res => {
-        window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+        openTaskPage(res['task'])
       }).catch(error => {
         this.$message.error(this.$t('common.getErrorMsg' + ' ' + error))
       })
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index e64c0a305..837159742 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -20,6 +20,7 @@ import AssetRelationCard from '@/components/AssetRelationCard'
 import ListTable from '@/components/ListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
 import { connectivityMeta } from '@/components/AccountListTable/const'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'AssetList',
@@ -72,7 +73,7 @@ export default {
                     const theUrl = `/api/v1/assets/system-users/${vm.object.id}/tasks/`
                     const data = { action: 'push', assets: [row.asset] }
                     this.$axios.post(theUrl, data).then(resp => {
-                      window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(resp['task'])
                     })
                   }
                 },
@@ -129,9 +130,8 @@ export default {
                 `/api/v1/assets/system-users/${this.object.id}/tasks/`,
                 { action: 'test' }
               ).then(res => {
-                window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
-              }
-              )
+                openTaskPage(res['task'])
+              })
             }.bind(this)
           }
         },
@@ -147,7 +147,7 @@ export default {
               const theUrl = `/api/v1/assets/system-users/${vm.object.id}/tasks/`
               const data = { action: 'push' }
               this.$axios.post(theUrl, data).then(resp => {
-                window.open(`/#/ops/celery/task/${resp.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(resp['task'])
               })
             }.bind(this)
           }
@@ -219,7 +219,7 @@ export default {
       })
       const data = { action: 'push', assets: assets }
       this.$axios.post(theUrl, data).then(resp => {
-        window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+        openTaskPage(resp['task'])
       })
     },
     bulkTestCallback({ selectedRows }) {
@@ -229,7 +229,7 @@ export default {
       })
       const data = { action: 'test', assets: assets }
       this.$axios.post(theUrl, data).then(resp => {
-        window.open(`/#/ops/task/task/${resp.task}/log/`, '', 'width=900,height=600')
+        openTaskPage(resp['task'])
       })
     }
   }
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index 4d76d0095..b1439344c 100644
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -15,6 +15,7 @@ import DetailCard from '@/components/DetailCard'
 import { toSafeLocalDateStr } from '@/utils/common'
 import RunInfoCard from '../../RunInfoCard'
 import { toLastFailureDisplay, toLastSucessDisplay } from '../business'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'HistoryExecutionDetail',
@@ -77,7 +78,7 @@ export default {
           value: this.object.id,
           formatter: function(row, value) {
             const onClick = function() {
-              window.open(`/#/ops/task/task/${value}/log/?type=ansible`, '', 'width=900,height=600')
+              openTaskPage(value)
             }
             const title = this.$t('common.View')
             return <a onClick={onClick} >{ title }</a>
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index 21ff7693a..8662e412b 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -15,6 +15,7 @@ import DetailCard from '@/components/DetailCard'
 import RunInfoCard from '../RunInfoCard/index'
 import { toLastFailureDisplay, toLastSucessDisplay } from './business'
 import { toSafeLocalDateStr } from '@/utils/common'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'TaskDetail',
@@ -101,7 +102,7 @@ export default {
           value: this.object.latest_execution.id,
           formatter: function(row, value) {
             const onClick = function() {
-              window.open(`/#/ops/task/task/${value}/log/?type=ansible`, '', 'width=900,height=600')
+              openTaskPage(value)
             }
             const title = this.$t('common.View')
             return <a onClick={onClick} >{ title }</a>
diff --git a/src/views/ops/TaskList.vue b/src/views/ops/TaskList.vue
index 98e61d64d..6e932c1bf 100644
--- a/src/views/ops/TaskList.vue
+++ b/src/views/ops/TaskList.vue
@@ -5,6 +5,7 @@
 <script type="text/jsx">
 import { timeOffset, toSafeLocalDateStr } from '@/utils/common'
 import { GenericListPage } from '@/layout/components'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   components: {
@@ -82,7 +83,7 @@ export default {
                     this.$axios.get(
                       `/api/v1/ops/tasks/${row.id}/run/`
                     ).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(res['task'])
                     })
                   }
                 }
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
index 23545c6c7..7cec763c9 100644
--- a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
+++ b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericListTable from '@/layout/components/GenericListTable/index'
 import { ActionsFormatter, DateFormatter } from '@/components/TableFormatters'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'HistoryList',
@@ -68,7 +69,7 @@ export default {
                   title: this.$t('common.View'),
                   type: 'primary',
                   callback: function(val) {
-                    window.open(`/#/ops/celery/task/${val.row.id}/log/`, '', 'width=900,height=600')
+                    openTaskPage(val.row.id)
                   }
                 }
               ]
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
index 12943e429..92281b659 100644
--- a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
+++ b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
@@ -13,6 +13,7 @@
 import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import { toSafeLocalDateStr } from '@/utils/common'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'Detail',
@@ -40,7 +41,7 @@ export default {
               this.$axios.get(
                 `/api/v1/xpack/cloud/sync-instance-tasks/${this.object.id}/run/`
               ).then(res => {
-                window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                openTaskPage(res['task'])
               }
               )
             }.bind(this)
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
index 782aaf704..5d7cf62ca 100644
--- a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
+++ b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericListTable from '@/layout/components/GenericListTable'
 import { DetailFormatter } from '@/components/TableFormatters'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   components: {
@@ -40,7 +41,7 @@ export default {
                   type: 'info',
                   callback: function(data) {
                     this.$axios.get(`/api/v1/xpack/cloud/sync-instance-tasks/${data.row.id}/run/`).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
+                      openTaskPage(res['task'])
                     })
                   }
                 }