From d22999878517d7e02182f37669cdecdcf45319c3 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 28 Oct 2021 17:13:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20--bug=3D1007382=20--user=3D=E5=88=98?=
 =?UTF-8?q?=E7=91=9E=E6=96=8C=20=E3=80=90=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E3=80=91=E6=89=A7=E8=A1=8C=E6=8F=90=E7=A4=BA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E9=83=BD=E5=A1=AB=E5=86=99=E4=BA=86=20https://www.tap?=
 =?UTF-8?q?d.cn/55049933/s/1061235?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/PerformancePressureConfig.vue           | 6 +++---
 .../plan/view/comonents/load/PerformanceLoadConfig.vue      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 045795118e..88a276d401 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -593,13 +593,13 @@ export default {
       }
       for (let i = 0; i < this.threadGroups.length; i++) {
         let tg = this.threadGroups[i];
-        if (tg.enabled === 'false' ) {
-          continue;
-        }
         tg.durationHours = tg.durationHours || 0;
         tg.durationMinutes = tg.durationMinutes || 0;
         tg.durationSeconds = tg.durationSeconds || 0;
         this.getDuration(tg);
+        if (tg.enabled === 'false' ) {
+          continue;
+        }
         if (!tg.threadNumber || !tg.duration
             || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
           this.$warning(this.$t('load_test.pressure_config_params_is_empty'));
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue b/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
index f8121cb1a4..0e0bb64b6c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
@@ -594,13 +594,13 @@ export default {
 
       for (let i = 0; i < this.threadGroups.length; i++) {
         let tg = this.threadGroups[i];
-        if (tg.enabled === 'false' ) {
-          continue;
-        }
         tg.durationHours = tg.durationHours || 0;
         tg.durationMinutes = tg.durationMinutes || 0;
         tg.durationSeconds = tg.durationSeconds || 0;
         this.getDuration(tg);
+        if (tg.enabled === 'false' ) {
+          continue;
+        }
         if (!tg.threadNumber || !tg.duration
           || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
           this.$warning(this.$t('load_test.pressure_config_params_is_empty'));