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

---
 .../components/PerformancePressureConfig.vue  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index e7a364cfe8..045795118e 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -6,11 +6,11 @@
           <el-form-item :label="$t('load_test.select_resource_pool')">
             <el-select v-model="resourcePool" :disabled="isReadOnly" size="mini" @change="resourcePoolChange">
               <el-option
-                v-for="item in resourcePools"
-                :key="item.id"
-                :label="item.name"
-                :disabled="!item.performance"
-                :value="item.id">
+                  v-for="item in resourcePools"
+                  :key="item.id"
+                  :label="item.name"
+                  :disabled="!item.performance"
+                  :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -82,10 +82,10 @@
               <el-form-item :label="$t('load_test.on_sample_error')">
                 <el-select v-model="threadGroup.onSampleError" :disabled="isReadOnly" size="mini">
                   <el-option
-                    v-for="item in onSampleErrors"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                      v-for="item in onSampleErrors"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -223,7 +223,6 @@
 </template>
 
 <script>
-import echarts from "echarts";
 import MsChart from "@/business/components/common/chart/MsChart";
 import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
 import {hasPermission} from "@/common/js/utils";
@@ -253,11 +252,11 @@ const DELETED = "deleted";
 
 const hexToRgba = function (hex, opacity) {
   return 'rgba(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5)) + ','
-    + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
+      + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
 };
 const hexToRgb = function (hex) {
   return 'rgb(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5))
-    + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
+      + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
 };
 
 export default {
@@ -498,8 +497,8 @@ export default {
         let tg = handler.threadGroups[i];
 
         if (tg.enabled === 'false' ||
-          tg.deleted === 'true' ||
-          tg.threadType === 'ITERATION') {
+            tg.deleted === 'true' ||
+            tg.threadType === 'ITERATION') {
           continue;
         }
         if (this.getDuration(tg) < tg.rampUpTime) {
@@ -594,12 +593,15 @@ 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.threadNumber || !tg.duration
-          || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
+            || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
           this.$warning(this.$t('load_test.pressure_config_params_is_empty'));
           this.$emit('changeActive', '1');
           return false;