From a78f8591f8f6482f778702d4165cdb9399f6b76a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 23 Mar 2022 17:59:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E8=AE=BE=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=9A=94=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?=E5=8E=8B=E6=B5=8B=E6=97=B6=E9=95=BF=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011623 --user=刘瑞斌 【性能测试】-定时任务执行时间3分钟一次，小于该性能测试执行时间5分钟，建议提示不能小于性能测试执行时间 https://www.tapd.cn/55049933/s/1124645
---
 .../performance/test/EditPerformanceTest.vue  | 10 ++++++--
 .../performance/test/PerformanceTestList.vue  | 23 ++++++++++---------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 978b3595b3..c2ac2220b0 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -463,8 +463,14 @@ export default {
       return true;
     },
     durationValidate(intervalTime) {
-      let duration = this.$refs.pressureConfig.duration * 60 * 1000;
-      if (intervalTime < duration) {
+      let duration = 0;
+      this.$refs.pressureConfig.threadGroups.forEach(tg => {
+        let d = this.$refs.pressureConfig.getDuration(tg);
+        if (duration < d) {
+          duration = d;
+        }
+      });
+      if (intervalTime < duration * 1000) {
         return {
           pass: false,
           info: this.$t('load_test.schedule_tip')
diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
index cbd0f33c26..485e262fbf 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestList.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -33,18 +33,9 @@
           <el-table-column
             prop="num"
             label="ID"
-            width="100"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            v-if="versionEnable"
-            :label="$t('project.version.name')"
-            :filters="versionFilters"
-            column-key="versionId"
-            min-width="100px"
-            prop="versionId">
+            width="100">
             <template v-slot:default="scope">
-              <span>{{ scope.row.versionName }}</span>
+              <span @click="link(scope.row)" style="cursor: pointer;">{{ scope.row.num }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -55,6 +46,16 @@
               <span @click="link(scope.row)" style="cursor: pointer;">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            v-if="versionEnable"
+            :label="$t('project.version.name')"
+            :filters="versionFilters"
+            column-key="versionId"
+            prop="versionId">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.versionName }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="userName"
             sortable="custom"