From 66c627d33a38c39b4ad633e83b786ae56fa3cc85 Mon Sep 17 00:00:00 2001
From: liangdaliang <liangdaliang@wondersoft.cn>
Date: Wed, 28 May 2025 13:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/common/utils/JMeterGroupUtil.java    |  6 +++---
 .../test/performance/performanceEdit.vue      | 20 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/test-common/src/main/java/com/test/common/utils/JMeterGroupUtil.java b/test-common/src/main/java/com/test/common/utils/JMeterGroupUtil.java
index e762b58..bdc2be0 100644
--- a/test-common/src/main/java/com/test/common/utils/JMeterGroupUtil.java
+++ b/test-common/src/main/java/com/test/common/utils/JMeterGroupUtil.java
@@ -284,9 +284,10 @@ public class JMeterGroupUtil {
         if (executeType == 1) {
             threadGroup.setDuration(pressureSecond);
             threadGroup.setProperty(new TestElementProperty(ThreadGroup.MAIN_CONTROLLER, createLoopController(-1)));
-            threadGroup.setProperty(new StringProperty(ThreadGroup.SCHEDULER, "true"));
-            threadGroup.setProperty(new StringProperty(ThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION, "true"));
+            threadGroup.setProperty(new BooleanProperty(ThreadGroup.IS_SAME_USER_ON_NEXT_ITERATION, true));
+            threadGroup.setScheduler(true);
         } else {
+            threadGroup.setScheduler(false);
             threadGroup.setProperty(new TestElementProperty(ThreadGroup.MAIN_CONTROLLER, createLoopController(loops)));
         }
         if (errorOperType == 1) {
@@ -300,7 +301,6 @@ public class JMeterGroupUtil {
         } else if (errorOperType == 5) {
             threadGroup.setProperty(new StringProperty(ThreadGroup.ON_SAMPLE_ERROR, "stoptestnow"));
         }
-        threadGroup.setScheduler(false);
         threadGroup.setProperty(TestElement.TEST_CLASS, ThreadGroup.class.getName());
         threadGroup.setProperty(TestElement.GUI_CLASS, ThreadGroupGui.class.getName());
         threadGroup.setProperty(new BooleanProperty(TestElement.ENABLED, true));
diff --git a/test-ui/src/views/test/performance/performanceEdit.vue b/test-ui/src/views/test/performance/performanceEdit.vue
index ce5678b..6a4a4ee 100644
--- a/test-ui/src/views/test/performance/performanceEdit.vue
+++ b/test-ui/src/views/test/performance/performanceEdit.vue
@@ -145,6 +145,7 @@
 
 <script>
 import { editTest, editAndExecuteTest, getTestCaseList, getTestDetail, executeTest } from '../../../api/performance';
+import {runTestPlanCase} from "../../../api/test/planCase";
 
 export default {
   name: "PerformanceEdit",
@@ -262,17 +263,18 @@ export default {
     },
     // 立即执行
     handleWithExecute() {
-      this.loading = true;
-      executeTest(this.$route.query.id).then(res => {
-        if (res.code === 200) {
-          this.$message({ message: '执行成功', type: 'success' })
-          // this.$tab.closeOpenPage({ path: "/performance/performance" });
-        } else {
-          this.$message({ message: '执行失败', type: 'error' })
-        }
+      const myId = this.$route.query.id;
+      this.$modal.confirm('是否确认立即执行性能测试？').then(function () {
+        return executeTest(myId);
+      }).then((res) => {
+          if (res.code === 200) {
+            this.$modal.msgSuccess("提交执行成功");
+          } else {
+            this.$message({ message: '提交执行失败', type: 'error' })
+          }
       }).finally(() => {
         this.loading = false;
-      })
+      });
     },
     // 取消
     handleWithCancel() {