From f031dddf4c5eefb3ccf0e12664b2955b242cd1ea Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 18 May 2021 14:05:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8E=8B=E5=8A=9B=E9=A2=84=E4=BC=B0=E5=9B=BE=E6=97=B6=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E7=85=A7=E8=BF=AD=E4=BB=A3=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PerformancePressureConfig.vue  | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
index 5b6475e955..57db4e43f3 100644
--- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
@@ -48,11 +48,11 @@
               <div v-if="threadGroup.threadType === 'DURATION'">
                 <el-form-item :label="$t('load_test.duration')">
                   <el-input-number
-                      :disabled="true"
-                      v-model="threadGroup.duration"
-                      :min="1"
-                      @change="calculateTotalChart(threadGroup)"
-                      size="mini"/>
+                    :disabled="true"
+                    v-model="threadGroup.duration"
+                    :min="1"
+                    @change="calculateTotalChart()"
+                    size="mini"/>
                 </el-form-item>
                 <el-form-item>
                   <el-radio-group v-model="threadGroup.unit" :disabled="true">
@@ -66,31 +66,31 @@
                   <el-switch v-model="threadGroup.rpsLimitEnable" :disabled="true" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
-                      :disabled="true"
-                      v-model="threadGroup.rpsLimit"
-                      @change="calculateTotalChart(threadGroup)"
-                      :min="1"
-                      size="mini"/>
+                    :disabled="true"
+                    v-model="threadGroup.rpsLimit"
+                    @change="calculateTotalChart()"
+                    :min="1"
+                    size="mini"/>
                 </el-form-item>
                 <br>
                 <div v-if="threadGroup.tgType === 'com.blazemeter.jmeter.threads.concurrency.ConcurrencyThreadGroup'">
                   <el-form-item :label="$t('load_test.ramp_up_time_within')">
                     <el-input-number
-                        :disabled="true"
-                        :min="1"
-                        :max="threadGroup.duration"
-                        v-model="threadGroup.rampUpTime"
-                        @change="calculateTotalChart(threadGroup)"
-                        size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="threadGroup.duration"
+                      v-model="threadGroup.rampUpTime"
+                      @change="calculateTotalChart()"
+                      size="mini"/>
                   </el-form-item>
                   <el-form-item :label="$t('load_test.ramp_up_time_minutes', [getUnitLabel(threadGroup)])">
                     <el-input-number
-                        :disabled="true"
-                        :min="1"
-                        :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
-                        v-model="threadGroup.step"
-                        @change="calculateTotalChart(threadGroup)"
-                        size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
+                      v-model="threadGroup.step"
+                      @change="calculateTotalChart()"
+                      size="mini"/>
                   </el-form-item>
                   <el-form-item :label="$t('load_test.ramp_up_time_times')"/>
                 </div>
@@ -110,31 +110,31 @@
               <div v-if="threadGroup.threadType === 'ITERATION'">
                 <el-form-item :label="$t('load_test.iterate_num')">
                   <el-input-number
-                      :disabled="true"
-                      v-model="threadGroup.iterateNum"
-                      :min="1"
-                      @change="calculateTotalChart(threadGroup)"
-                      size="mini"/>
+                    :disabled="true"
+                    v-model="threadGroup.iterateNum"
+                    :min="1"
+                    @change="calculateTotalChart()"
+                    size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" :disabled="true" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
-                      :disabled="true || !threadGroup.rpsLimitEnable"
-                      v-model="threadGroup.rpsLimit"
-                      @change="calculateTotalChart(threadGroup)"
-                      :min="1"
-                      size="mini"/>
+                    :disabled="true || !threadGroup.rpsLimitEnable"
+                    v-model="threadGroup.rpsLimit"
+                    @change="calculateTotalChart()"
+                    :min="1"
+                    size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.ramp_up_time_within')">
                   <el-input-number
-                      :disabled="true"
-                      :min="1"
-                      v-model="threadGroup.iterateRampUp"
-                      @change="calculateTotalChart(threadGroup)"
-                      size="mini"/>
+                    :disabled="true"
+                    :min="1"
+                    v-model="threadGroup.iterateRampUp"
+                    @change="calculateTotalChart()"
+                    size="mini"/>
                 </el-form-item>
                 <el-form-item :label="$t('load_test.ramp_up_time_seconds', [getUnitLabel(threadGroup)])"/>
               </div>
@@ -256,7 +256,7 @@ export default {
               break;
           }
         });
-        this.calculateTotalChart(this.threadGroups[i]);
+        this.calculateTotalChart();
       }
     },
     getLoadConfig() {
@@ -340,7 +340,9 @@ export default {
 
 
       for (let i = 0; i < handler.threadGroups.length; i++) {
-        if (handler.threadGroups[i].enabled === 'false' || handler.threadGroups[i].deleted === 'true') {
+        if (handler.threadGroups[i].enabled === 'false' ||
+          handler.threadGroups[i].deleted === 'true' ||
+          handler.threadGroups[i].threadType === 'ITERATION') {
           continue;
         }
         let seriesData = {