From dd1ac7c7f845685a3601cff11d6985b5e7fc0fae Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 13 Oct 2022 10:38:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E6=97=A5?=
=?UTF-8?q?=E5=BF=97=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/common.js | 10 ++++++++++
src/utils/jms.js | 5 +++--
src/views/ops/TaskDetail/TaskDetail.vue | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/router/common.js b/src/router/common.js
index 208bc277d..14d815a4d 100644
--- a/src/router/common.js
+++ b/src/router/common.js
@@ -15,6 +15,16 @@ export default [
permissions: []
}
},
+ {
+ path: '/ops/ansible/task/:id/log/',
+ component: () => import('@/views/ops/CeleryTaskLog'),
+ name: 'AnsibleTaskLog',
+ hidden: true,
+ meta: {
+ title: i18n.t('route.CeleryTaskLog'),
+ permissions: []
+ }
+ },
{
path: '/ops/task/task/:id/log/',
component: () => import('@/views/ops/CeleryTaskLog'),
diff --git a/src/utils/jms.js b/src/utils/jms.js
index d1ff80932..588f7a107 100644
--- a/src/utils/jms.js
+++ b/src/utils/jms.js
@@ -2,8 +2,9 @@ import store from '@/store'
import { constantRoutes } from '@/router'
import { openWindow } from './common'
-export function openTaskPage(taskId) {
- openWindow(`/#/ops/celery/task/${taskId}/log/`)
+export function openTaskPage(taskId, taskType) {
+ taskType = taskType || 'celery'
+ openWindow(`/#/ops/${taskType}/task/${taskId}/log/?type=${taskType}`)
}
export function checkPermission(permsRequired, permsAll) {
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index c60d2d8c6..51ce796e1 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -108,7 +108,7 @@ export default {
openTaskPage(value, 'ansible')
}
const title = this.$t('common.View')
- return { title }
+ return { title }
}
}
]