From 66ad88357ccf804022a135b51a57355e543f7d50 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 14 May 2025 15:30:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1420883380371456]?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=BF=80=E6=B4=BB=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/142?=
 =?UTF-8?q?0883380371456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/detail/script-detail.vue   |  2 +-
 .../pages/autoexec/detail/test-detail.vue     | 27 +++++++++++++++----
 .../pages/autoexec/manage/script-manage.vue   | 16 ++++++++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/views/pages/autoexec/detail/script-detail.vue b/src/views/pages/autoexec/detail/script-detail.vue
index 6540b885..abcaff27 100644
--- a/src/views/pages/autoexec/detail/script-detail.vue
+++ b/src/views/pages/autoexec/detail/script-detail.vue
@@ -332,7 +332,7 @@ export default {
         return false;
       }
       let data = this.saveData();
-      if (this.$utils.isSame(this.initData, data)) {
+      if (this.$utils.isSame(this.initData, data) || this.versionStatus === 'passed') {
         this.$router.push({
           path: '/test-detail',
           query: {
diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue
index fd8cc106..f65bd4b2 100644
--- a/src/views/pages/autoexec/detail/test-detail.vue
+++ b/src/views/pages/autoexec/detail/test-detail.vue
@@ -155,7 +155,8 @@ export default {
       runnerGroup: {
         mappingMode: 'constant',
         value: '-1'
-      }
+      },
+      scriptId: null
     };
   },
   beforeCreate() {},
@@ -164,6 +165,9 @@ export default {
       if (this.$route.query.id) {
         this.id = parseInt(this.$route.query.id);
       }
+      if (this.$route.query.scriptId) {
+        this.scriptId = parseInt(this.$route.query.scriptId);
+      }
       if (this.$route.query.type) {
         this.type = this.$route.query.type;
       }
@@ -194,24 +198,37 @@ export default {
     },
     getData() {
       //根据id获取详情
-      if (!this.id) {
+      if (!this.id && !this.scriptId) {
         return;
       }
-      let param = { id: this.id, type: this.type};
+      let param = { type: this.type };
+      if (this.id) {
+        param.id = this.id;
+      } else if (this.scriptId) {
+        param.scriptId = this.scriptId;
+      }
       this.$api.autoexec.script.getTestDetail(param).then(res => {
         if (res.Status == 'OK' && res.Return) {
           this.dataConfig = res.Return;
           if (!this.jobId) {
             this.nameForm.itemList.name.value = this.dataConfig.name;
           }
+          if (!this.id) {
+            this.id = this.dataConfig.id;
+          }
         }
       });
     },
     getArgument() {
-      if (!this.id) {
+      if (!this.id && !this.scriptId) {
         return;
       }
-      let param = { id: this.id, type: this.type};
+      let param = { type: this.type };
+      if (this.id) {
+        param.id = this.id;
+      } else if (this.scriptId) {
+        param.scriptId = this.scriptId;
+      }
       this.$api.autoexec.script.getArgument(param).then(res => {
         if (res.Status == 'OK' && res.Return) {
           this.argumentConfig = res.Return || {};
diff --git a/src/views/pages/autoexec/manage/script-manage.vue b/src/views/pages/autoexec/manage/script-manage.vue
index a01f343d..0263f5f7 100644
--- a/src/views/pages/autoexec/manage/script-manage.vue
+++ b/src/views/pages/autoexec/manage/script-manage.vue
@@ -261,7 +261,8 @@ export default {
         'generateToCombop': 'tsfont-tool',
         'copy': 'tsfont-copy',
         'export': 'tsfont-download',
-        'delete': 'tsfont-trash-o'
+        'delete': 'tsfont-trash-o',
+        'test': 'tsfont-test'
       },
       showEdit: false,
       editId: null,
@@ -494,8 +495,21 @@ export default {
         this.exportRow(row);
       } else if (type == 'delete') {
         this.deleteRow(item, row);
+      } else if (type == 'test') {
+        this.testRow(row);
       }
     },
+    testRow(row) {
+      //跳转到测试页面
+      this.$router.push({
+        path: '/test-detail',
+        query: {
+          scriptId: row.id,
+          type: 'script',
+          execMode: row.execMode
+        }
+      });
+    },
     close(isRefresh) {
       this.editId = null;
       this.showEdit = false;
-- 
Gitee


From f093c0c8cc40d9df942c12a414e0a66d057da6c5 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 14 May 2025 16:34:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E9=94=9A=E7=82=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/detail/logcomponents/node-log.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/autoexec/detail/logcomponents/node-log.vue b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
index efd34d27..166047de 100644
--- a/src/views/pages/autoexec/detail/logcomponents/node-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
@@ -15,7 +15,7 @@
           v-for="(log, index) in logContentList"
           :id="'content' + index"
           :key="index"
-          :class="log.anchor && log.anchor.replace(/[-\.\/]+?/gi, '_')"
+          :class="log.anchor && ('content_'+ log.anchor).replace(/[-\.\/]+?/gi, '_')"
           class="content-grid"
         >
           <div class="text-grey">{{ log.time }}</div>
@@ -301,7 +301,7 @@ export default {
     locationId: {
       handler: function(val) {
         if (val) {
-          this.$utils.jumpTo('.' + val, 'smooth', this.$refs['codeContent'], 'start');
+          this.$utils.jumpTo('.content_' + val, 'smooth', this.$refs['codeContent'], 'start');
         }
       }
     }
-- 
Gitee