From acc3d86c4f4ac5f14616d626c02b092760b23a70 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 23 Apr 2025 17:02:42 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B7=B3=E8=BD=AC=20=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1405829578719233]=E4=BD=9C=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=B7=B3=E8=BD=AC=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/14058295787?=
 =?UTF-8?q?19233?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/manage/job-manage.vue   | 16 +++++++++-------
 src/views/pages/deploy/job/job-manage.vue        | 13 +++++++++----
 .../deploy/pipeline/list-deployjob-dialog.vue    | 10 +++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/pages/autoexec/manage/job-manage.vue b/src/views/pages/autoexec/manage/job-manage.vue
index f15865b8..d5cc30c5 100644
--- a/src/views/pages/autoexec/manage/job-manage.vue
+++ b/src/views/pages/autoexec/manage/job-manage.vue
@@ -38,7 +38,7 @@
             </span>
           </template>
           <template v-slot:name="{ row }">
-            <span v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'">
+            <span v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'" class="text-href" @click="toBatchJobDetail(row)">
               {{ row.name }}
             </span>
             <span
@@ -342,12 +342,14 @@ export default {
         query: { id: row.id }
       });
     },
-    //toBatchJobDetail(row) {
-    //   this.$router.push({
-    //     path: '/batch-job-detail',
-    //     query: { id: row.id }
-    //   });
-    // },
+    toBatchJobDetail(row) {
+      const {parentId = '', id = ''} = row || {};
+      if (parentId != -1) {
+        this.toJobDetail(row);
+      } else {
+        window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank');
+      }
+    },
     // toOperationDetail(row) {
     //   if (row.operationType == 'combop') {
     //     this.$router.push({
diff --git a/src/views/pages/deploy/job/job-manage.vue b/src/views/pages/deploy/job/job-manage.vue
index a07e7c83..68241e0b 100644
--- a/src/views/pages/deploy/job/job-manage.vue
+++ b/src/views/pages/deploy/job/job-manage.vue
@@ -598,10 +598,15 @@ export default {
       });
     },
     toBatchJobDetail(row) {
-      this.$router.push({
-        path: '/batch-job-detail',
-        query: { id: row.id }
-      });
+      const {parentId = ''} = row || {};
+      if (parentId != -1) {
+        this.toJobDetail(row);
+      } else {
+        this.$router.push({
+          path: '/batch-job-detail',
+          query: { id: row.id }
+        });
+      }
     },
     // toOperationDetail(row) {
     //   if (row.operationType == 'combop') {
diff --git a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
index bee0da3e..e63f116d 100644
--- a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
+++ b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
@@ -280,11 +280,11 @@ export default {
       });
     },
     toBatchJobDetail(row) {
-      if (row && row.id) {
-        this.$router.push({
-          path: '/batch-job-detail',
-          query: { id: row.id }
-        });
+      const {parentId = '', id = ''} = row || {};
+      if (parentId != -1) {
+        this.toJobDetail(row);
+      } else {
+        window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank');
       }
     }
   },
-- 
Gitee