From 6c00433f819f2a11943498316a8e94b0bf0f277f Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 8 Aug 2025 17:49:51 +0800
Subject: [PATCH] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=20=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E5=90=8D=E7=A7=B0=E7=BC=A9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/manage/job-manage.vue      | 28 +++++-----
 .../job/publishing/deploy-pipeline-table.vue  | 56 ++++++++++---------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/views/pages/autoexec/manage/job-manage.vue b/src/views/pages/autoexec/manage/job-manage.vue
index a80f2782..8f312555 100644
--- a/src/views/pages/autoexec/manage/job-manage.vue
+++ b/src/views/pages/autoexec/manage/job-manage.vue
@@ -38,11 +38,7 @@
             </span>
           </template>
           <template v-slot:name="{ row }">
-            <span v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'" class="text-href" @click="toBatchJobDetail(row)">
-              {{ row.name }}
-            </span>
             <span
-              v-else
               class="text-href"
               :class="{ 'ml-nm': !!row.parentId && row.parentId != -1 }"
               @click="toJobDetail(row)"
@@ -337,17 +333,21 @@ export default {
       }
     },
     toJobDetail(row) {
-      this.$router.push({
-        path: '/job-detail',
-        query: { id: row.id }
-      });
-    },
-    toBatchJobDetail(row) {
-      const {parentId = '', id = ''} = row || {};
-      if (parentId != -1) {
-        this.toJobDetail(row);
+      if (row.source === 'batchdeploy' || row.source === 'deployschedulepipeline') {
+        const {parentId = '', id = ''} = row || {};
+        if (parentId != -1) {
+          this.$router.push({
+            path: '/job-detail',
+            query: { id: row.id }
+          });
+        } else {
+          window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank');
+        }
       } else {
-        window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank');
+        this.$router.push({
+          path: '/job-detail',
+          query: { id: row.id }
+        });
       }
     },
     // toOperationDetail(row) {
diff --git a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
index 2301f263..d2b69fa4 100644
--- a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
+++ b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
@@ -25,21 +25,14 @@
       </template>
       <template v-slot:name="{ row }">
         <span
-          v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'"
-          class="text-href"
-          @click="toBatchJobDetail(row)"
-          @contextmenu="newTab($event, row, 'batch-job-detail')"
-        >
-          {{ row.name }}
-        </span>
-        <span
-          v-else
           class="text-href"
           :class="{ 'ml-nm': (!!row.parentId && row.parentId != -1) }"
-          @contextmenu="newTab($event, row, 'job-detail')"
+          @contextmenu="newTab($event, row)"
           @click="toJobDetail(row)"
         >{{ row.name }}</span>
-        <span><Status v-if="row.reviewStatus != 'passed'" :statusValue="row.reviewStatus" :statusName="row.reviewStatusName"></Status></span>
+        <span>
+          <Status v-if="row.reviewStatus != 'passed'" :statusValue="row.reviewStatus" :statusName="row.reviewStatusName"></Status>
+        </span>
         <Tooltip
           v-if="row.warnCount > 0 || row.isHasIgnored > 0"
           transfer
@@ -265,32 +258,41 @@ export default {
         }
       });
     },
-    toBatchJobDetail(row) {
-      const {parentId = ''} = row || {};
-      if (parentId != -1) {
-        this.toJobDetail(row);
-      } else {
-        this.$router.push({
-          path: '/batch-job-detail',
-          query: { id: row.id }
-        });
-      }
-    },
-    newTab(e, row, redirectPage) {
+    newTab(e, row) {
       //鼠标右键打开新标签页
       let base = this.$router.options.base;
       let params = '';
+      let redirectPage = 'job-detail';
+
       if (row && row.id) {
         params = `?id=${row.id}`;
       }
+      if (row.source === 'batchdeploy' || row.source === 'deployschedulepipeline') {
+        redirectPage = 'batch-job-detail';
+      }
       let replaceStr = `<a href="${base}#${redirectPage}${params}" class="cursor">${row.name}</a>`;
       e.currentTarget.innerHTML = replaceStr;
     },
     toJobDetail(row) {
-      this.$router.push({
-        path: '/job-detail',
-        query: { id: row.id }
-      });
+      if (row.source === 'batchdeploy' || row.source === 'deployschedulepipeline') {
+        const {parentId = ''} = row || {};
+        if (parentId != -1) {
+          this.$router.push({
+            path: '/job-detail',
+            query: { id: row.id }
+          });
+        } else {
+          this.$router.push({
+            path: '/batch-job-detail',
+            query: { id: row.id }
+          });
+        }
+      } else {
+        this.$router.push({
+          path: '/job-detail',
+          query: { id: row.id }
+        });
+      }
     },
     toRoute(row) {
       let routeConfig = row.route?.config;
-- 
Gitee