From 37acc581f205d340df51e2a6129b1e3776d19bea Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:40:02 +0800
Subject: [PATCH 01/14] =?UTF-8?q?refactor:=20=E5=85=A8=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/list/ApiList.vue | 1 +
 .../track/plan/view/comonents/base/RelevanceDialog.vue    | 4 ++--
 frontend/src/common/css/main.css                          | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index a4fe6c3e9a..d7afbd7483 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -80,6 +80,7 @@
 
         <el-table-column
           prop="casePassingRate"
+          :width="100"
           :label="$t('api_test.definition.api_case_passing_rate')"
           show-overflow-tooltip/>
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
index 26c80bfb53..de83468865 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
@@ -59,11 +59,11 @@
 <style scoped>
 
   .el-dialog {
-    min-height: 700px;
+    min-height: 600px;
   }
 
   .tree-aside {
-    max-height: 700px;
+    max-height: 600px;
   }
 
   .el-dialog >>> .el-dialog__body {
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index f80a1b9976..c14a241985 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -142,9 +142,9 @@ html,body {
   border: 1px solid #DCDFE6;
   border-radius:5px;
   padding: 0px;
-  margin-top: 5px;
+  margin-top: 10px;
   display: inline-block;
-  margin-top: 25px;
+  /*margin-top: 25px;*/
   width: 50px;
 }
 
@@ -164,8 +164,8 @@ html,body {
 .ms-select-all .el-icon-arrow-down {
   position: absolute;
   display: inline-block;
-  top: -3px;
-  left: -40px;
+  top: -7px;
+  left: -38px;
   width: 30px;
 }
 /* 表格全选样式 --> */

From a259db45bcff7e02ce121444d537b73353f0a7dc Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:58:01 +0800
Subject: [PATCH 02/14] =?UTF-8?q?fix:=20swagger=20=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/api/parse/Swagger2Parser.java    | 4 +++-
 .../main/java/io/metersphere/api/parse/Swagger3Parser.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index 8d78614dad..d61d9af101 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -97,8 +97,10 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         String name = "";
         if (StringUtils.isNotBlank(operation.getSummary())) {
             name = operation.getSummary();
-        } else {
+        } else  if (StringUtils.isNotBlank(operation.getOperationId())) {
             name = operation.getOperationId();
+        } else {
+            name = path;
         }
         return buildApiDefinition(id, name, path, method);
     }
diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
index 3e8ab93dd9..92edcfddf1 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
@@ -129,8 +129,10 @@ public class Swagger3Parser extends ApiImportAbstractParser {
         String name = "";
         if (StringUtils.isNotBlank(operation.getSummary())) {
             name = operation.getSummary();
-        } else {
+        } else if (StringUtils.isNotBlank(operation.getOperationId())) {
             name = operation.getOperationId();
+        } else {
+            name = path;
         }
         return buildApiDefinition(id, name, path, method);
     }

From e927b1e6acc4140f2beec696a4ec2ef0ac723c7c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:58:01 +0800
Subject: [PATCH 03/14] =?UTF-8?q?fix:=20swagger=20=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/api/parse/Swagger2Parser.java    | 4 +++-
 .../main/java/io/metersphere/api/parse/Swagger3Parser.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index 8d78614dad..d61d9af101 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -97,8 +97,10 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         String name = "";
         if (StringUtils.isNotBlank(operation.getSummary())) {
             name = operation.getSummary();
-        } else {
+        } else  if (StringUtils.isNotBlank(operation.getOperationId())) {
             name = operation.getOperationId();
+        } else {
+            name = path;
         }
         return buildApiDefinition(id, name, path, method);
     }
diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
index 3e8ab93dd9..92edcfddf1 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
@@ -129,8 +129,10 @@ public class Swagger3Parser extends ApiImportAbstractParser {
         String name = "";
         if (StringUtils.isNotBlank(operation.getSummary())) {
             name = operation.getSummary();
-        } else {
+        } else if (StringUtils.isNotBlank(operation.getOperationId())) {
             name = operation.getOperationId();
+        } else {
+            name = path;
         }
         return buildApiDefinition(id, name, path, method);
     }

From 606a8fb38ebea756f94eaf267e2fc5810860c911 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:22:21 +0800
Subject: [PATCH 04/14] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=B0=8F=E5=B1=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/api/RelevanceApiList.vue     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index 70a5b457a4..43c32c3250 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -3,9 +3,10 @@
     :is-api-list-enable="isApiListEnable"
     @isApiListEnableChange="isApiListEnableChange">
 
-    <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly" @setEnvironment="setEnvironment"/>
+      <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly" @setEnvironment="setEnvironment"/>
+
+      <el-input placeholder="搜索" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
 
-    <el-input placeholder="搜索" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
 
     <el-table v-loading="result.loading"
               border
@@ -253,8 +254,8 @@
 
   .search-input {
     float: right;
-    width: 300px;
-    /*margin-bottom: 20px;*/
+    width: 30%;
+    margin-bottom: 20px;
     margin-right: 20px;
   }
 

From e8afbf3cb56530a7d7a8cea7ad5d4a9c488db647 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:40:02 +0800
Subject: [PATCH 05/14] =?UTF-8?q?refactor:=20=E5=85=A8=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/list/ApiList.vue | 1 +
 .../track/plan/view/comonents/base/RelevanceDialog.vue    | 4 ++--
 frontend/src/common/css/main.css                          | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index a4fe6c3e9a..d7afbd7483 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -80,6 +80,7 @@
 
         <el-table-column
           prop="casePassingRate"
+          :width="100"
           :label="$t('api_test.definition.api_case_passing_rate')"
           show-overflow-tooltip/>
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
index 26c80bfb53..de83468865 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
@@ -59,11 +59,11 @@
 <style scoped>
 
   .el-dialog {
-    min-height: 700px;
+    min-height: 600px;
   }
 
   .tree-aside {
-    max-height: 700px;
+    max-height: 600px;
   }
 
   .el-dialog >>> .el-dialog__body {
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index f80a1b9976..c14a241985 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -142,9 +142,9 @@ html,body {
   border: 1px solid #DCDFE6;
   border-radius:5px;
   padding: 0px;
-  margin-top: 5px;
+  margin-top: 10px;
   display: inline-block;
-  margin-top: 25px;
+  /*margin-top: 25px;*/
   width: 50px;
 }
 
@@ -164,8 +164,8 @@ html,body {
 .ms-select-all .el-icon-arrow-down {
   position: absolute;
   display: inline-block;
-  top: -3px;
-  left: -40px;
+  top: -7px;
+  left: -38px;
   width: 30px;
 }
 /* 表格全选样式 --> */

From 730f7452cd4418a2550305159afb82c97fa23f0b Mon Sep 17 00:00:00 2001
From: ronghuaxiang <ixiangronghua@163.com>
Date: Tue, 5 Jan 2021 14:50:55 +0800
Subject: [PATCH 06/14] Update JMeterVars.java (#981)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决使用JSONPath的$..xx的语法匹配多个值时，提取出来的值不应该只有一个，
解决多值匹配时候变量无法传递问题

Co-authored-by: xiangronghua <xiangronghua@163.com>
---
 .../io/metersphere/api/jmeter/JMeterVars.java | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
index 84b1c089fd..5398e7e4cf 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
@@ -1,5 +1,6 @@
 package io.metersphere.api.jmeter;
 
+import com.alibaba.fastjson.JSON;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
 import org.apache.jmeter.extractor.JSR223PostProcessor;
 import org.apache.jmeter.extractor.RegexExtractor;
@@ -30,12 +31,29 @@ public class JMeterVars {
      * @param vars
      * @param extract
      */
-    public static void addVars(Integer testId, JMeterVariables vars, String extract) {
+     public static void addVars(Integer testId, JMeterVariables vars, String extract) {
         JMeterVariables vs = new JMeterVariables();
-
         if (!StringUtils.isEmpty(extract) && vars != null) {
             List<String> extracts = Arrays.asList(extract.split(";"));
             Optional.ofNullable(extracts).orElse(new ArrayList<>()).forEach(item -> {
+
+                String nrKey = item + "_matchNr";
+                Object nr = vars.get(nrKey);
+                if (nr != null) {
+                    int nrv = 0;
+                    try {
+                        nrv = Integer.valueOf(String.valueOf(nr));
+                    } catch (Exception e) {
+                    }
+                    if (nrv > 0) {
+                        List<Object> data = new ArrayList<>();
+                        for (int i = 1; i < nrv + 1; i++) {
+                            data.add(vars.get(item + "_" + i));
+                        }
+                        String array = JSON.toJSONString(data);
+                        vars.put(item, array);
+                    }
+                }
                 vs.put(item, vars.get(item) == null ? "" : vars.get(item));
             });
             vs.remove("TESTSTART.MS"); // 标示变量移除

From 2a605a77c0f467948598ff04d5dd4473d652b0bf Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 15:40:02 +0800
Subject: [PATCH 07/14] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/reference/ApiExtendBtns.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue b/frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
index b9c884dbbe..9349c33f06 100644
--- a/frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
+++ b/frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
@@ -5,7 +5,7 @@
     </el-link>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="ref">{{ $t('api_test.automation.view_ref') }}</el-dropdown-item>
-      <el-dropdown-item :disabled="isCaseEdit" command="add_plan">{{ $t('api_test.automation.batch_add_plan') }}</el-dropdown-item>
+      <!--<el-dropdown-item :disabled="isCaseEdit" command="add_plan">{{ $t('api_test.automation.batch_add_plan') }}</el-dropdown-item>-->
     </el-dropdown-menu>
     <ms-reference-view ref="viewRef"/>
     <!--测试计划-->

From 2c2f8b847617047b33f98d6259cba638efad4de6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 5 Jan 2021 16:29:07 +0800
Subject: [PATCH 08/14] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiDefinitionExecResultService.java           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 362781a4cf..10ca968510 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -14,6 +14,7 @@ import io.metersphere.track.service.TestPlanApiCaseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -60,6 +61,9 @@ public class ApiDefinitionExecResultService {
     }
 
     public void deleteByResourceIds(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
         ApiDefinitionExecResultExample example = new ApiDefinitionExecResultExample();
         example.createCriteria().andResourceIdIn(ids);
         apiDefinitionExecResultMapper.deleteByExample(example);

From 6b6acf4ca7c941c1013af1e0666dde2c8fa788f3 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 5 Jan 2021 17:25:24 +0800
Subject: [PATCH 09/14] =?UTF-8?q?build:=20Jenkinsfile=20=E4=B8=8D=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=20parameter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 65ab9ec657..994ddca141 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,9 +5,9 @@ pipeline {
         }
     }
     options { quietPeriod(600) }
-    parameters { 
-        string(name: 'IMAGE_NAME', defaultValue: 'metersphere', description: '构建后的 Docker 镜像名称')
-        string(name: 'IMAGE_PREFIX', defaultValue: 'registry.cn-qingdao.aliyuncs.com/metersphere', description: '构建后的 Docker 镜像带仓库名的前缀')
+    environment { 
+        IMAGE_NAME = 'metersphere'
+        IMAGE_PREFIX = 'registry.cn-qingdao.aliyuncs.com/metersphere'
     }
     stages {
         stage('Build/Test') {

From 1a43a1605aef317d04db31b95209187b1e2c1fc7 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 5 Jan 2021 17:32:28 +0800
Subject: [PATCH 10/14] =?UTF-8?q?fix:=20=E6=9B=B4=E6=8D=A2jenkins=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/controller/TestPlanController.java  | 4 ++--
 .../metersphere/track/service/TestPlanTestCaseService.java   | 1 -
 .../src/business/components/settings/system/EmailSetting.vue | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
index b5240048a6..c896bc41b3 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
@@ -46,11 +46,11 @@ public class TestPlanController {
 
     /*jenkins测试计划*/
     @GetMapping("/list/all/{projectId}/{workspaceId}")
-    public List<TestPlanDTO> listByProjectId(@PathVariable String projectId, @PathVariable String workspaceId) {
+    public List<TestPlanDTOWithMetric> listByProjectId(@PathVariable String projectId, @PathVariable String workspaceId) {
         QueryTestPlanRequest request = new QueryTestPlanRequest();
         request.setWorkspaceId(workspaceId);
         request.setProjectId(projectId);
-        return testPlanService.listTestPlanByProject(request);
+        return testPlanService.listTestPlan(request);
     }
 
     @PostMapping("/list/all")
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index a5c3202b41..8de4cdbcab 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -57,7 +57,6 @@ public class TestPlanTestCaseService {
     }
     public List<TestPlanCaseDTO> listByPlanId(QueryTestPlanCaseRequest request) {
         List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.listByPlanId(request);
-
         return list;
     }
 
diff --git a/frontend/src/business/components/settings/system/EmailSetting.vue b/frontend/src/business/components/settings/system/EmailSetting.vue
index a62aa8118e..51c2bae52b 100644
--- a/frontend/src/business/components/settings/system/EmailSetting.vue
+++ b/frontend/src/business/components/settings/system/EmailSetting.vue
@@ -48,15 +48,12 @@
       </el-row>
 
       <!---->
-      <div style="border: 0px;margin-bottom: 20px;margin-top: 20px">
+      <div style="border: 0px;margin-bottom: 20px">
         <el-checkbox v-model="formInline.ssl" :label="$t('system_parameter_setting.SSL')"></el-checkbox>
       </div>
       <div style="border: 0px;margin-bottom: 20px">
         <el-checkbox v-model="formInline.tls" :label="$t('system_parameter_setting.TLS')"></el-checkbox>
       </div>
-<!--      <div style="border: 0px;margin-bottom: 20px">
-        <el-checkbox v-model="formInline.ANON" :label="$t('system_parameter_setting.SMTP')"></el-checkbox>
-      </div>-->
       <template v-slot:footer>
       </template>
     </el-form>

From 9a32e83a015ec70295f6ef51290423652d37e2af Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 5 Jan 2021 17:43:55 +0800
Subject: [PATCH 11/14] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接口测试首页优化
---
 .../api/controller/APITestController.java     |  19 +-
 .../dto/automation/ApiScenarioRequest.java    |   3 +
 .../dto/datacount/ExecutedCaseInfoResult.java |   5 +
 .../response/ExecutedCaseInfoDTO.java         |   7 +
 .../datacount/response/TaskInfoResult.java    |   2 +
 .../dto/definition/ApiDefinitionRequest.java  |   4 +
 .../dto/definition/ApiTestCaseRequest.java    |   2 +
 .../api/service/ApiAutomationService.java     |   7 +
 .../ApiDefinitionExecResultService.java       |  20 +-
 .../api/service/ApiDefinitionService.java     |  10 +
 .../api/service/ApiTestCaseService.java       |   7 +
 .../ext/ExtApiDefinitionExecResultMapper.xml  |  24 +-
 .../mapper/ext/ExtApiDefinitionMapper.xml     |  13 +
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  13 +
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |   6 +
 .../base/mapper/ext/ExtScheduleMapper.xml     |  13 +-
 .../base/mapper/ext/ExtTestPlanMapper.xml     |   2 +-
 .../track/service/TestPlanService.java        |   4 +
 .../api/automation/ApiAutomation.vue          | 221 +++--
 .../automation/scenario/ApiScenarioList.vue   |  39 +-
 .../api/definition/ApiDefinition.vue          | 564 ++++++------
 .../components/list/ApiCaseSimpleList.vue     | 690 ++++++++-------
 .../definition/components/list/ApiList.vue    | 830 ++++++++++--------
 .../api/homepage/ApiTestHomePage.vue          |  28 +-
 .../api/homepage/components/ApiInfoCard.vue   |  22 +-
 .../components/FailureTestCaseList.vue        |  31 +-
 .../homepage/components/RunningTaskList.vue   |  11 +-
 .../api/homepage/components/SceneInfoCard.vue |  26 +-
 .../homepage/components/TestCaseInfoCard.vue  |  29 +-
 frontend/src/i18n/en-US.js                    |  12 +-
 frontend/src/i18n/zh-CN.js                    |  12 +-
 frontend/src/i18n/zh-TW.js                    |  12 +-
 32 files changed, 1551 insertions(+), 1137 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 421eec048a..9d461bb032 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -285,17 +285,17 @@ public class APITestController {
 
         long taskCountInThisWeek = scheduleService.countTaskByProjectIdInThisWeek(projectId);
         apiCountResult.setThisWeekAddedCount(taskCountInThisWeek);
-        long api_executedInThisWeekCountNumber = apiReportService.countByProjectIdAndCreateInThisWeek(projectId);
-        long scene_executedInThisWeekCountNumber = apiScenarioReportService.countByProjectIdAndCreateAndByScheduleInThisWeek(projectId);
-        long executedInThisWeekCountNumber = api_executedInThisWeekCountNumber+scene_executedInThisWeekCountNumber;
+//        long api_executedInThisWeekCountNumber = apiReportService.countByProjectIdAndCreateInThisWeek(projectId);
+        long executedInThisWeekCountNumber = apiScenarioReportService.countByProjectIdAndCreateAndByScheduleInThisWeek(projectId);
+//        long executedInThisWeekCountNumber = api_executedInThisWeekCountNumber+scene_executedInThisWeekCountNumber;
         apiCountResult.setThisWeekExecutedCount(executedInThisWeekCountNumber);
 
         //统计 失败 成功 以及总数
-        List<ApiDataCountResult> api_allExecuteResult = apiReportService.countByProjectIdGroupByExecuteResult(projectId);
-        List<ApiDataCountResult> scene_allExecuteResult = apiScenarioReportService.countByProjectIdGroupByExecuteResult(projectId);
-        List<ApiDataCountResult> allExecuteResult = new ArrayList<>();
-        allExecuteResult.addAll(api_allExecuteResult);
-        allExecuteResult.addAll(scene_allExecuteResult);
+//        List<ApiDataCountResult> api_allExecuteResult = apiReportService.countByProjectIdGroupByExecuteResult(projectId);
+        List<ApiDataCountResult> allExecuteResult = apiScenarioReportService.countByProjectIdGroupByExecuteResult(projectId);
+//        List<ApiDataCountResult> allExecuteResult = new ArrayList<>();
+//        allExecuteResult.addAll(api_allExecuteResult);
+//        allExecuteResult.addAll(scene_allExecuteResult);
         apiCountResult.countScheduleExecute(allExecuteResult);
 
         long allCount = apiCountResult.getExecutedCount();
@@ -322,11 +322,12 @@ public class APITestController {
 
             if(dataIndex<selectDataList.size()){
                 ExecutedCaseInfoResult selectData = selectDataList.get(dataIndex);
-
+                dataDTO.setCaseID(selectData.getTestCaseID());
                 dataDTO.setCaseName(selectData.getCaseName());
                 dataDTO.setTestPlan(selectData.getTestPlan());
                 dataDTO.setFailureTimes(selectData.getFailureTimes());
                 dataDTO.setCaseType(selectData.getCaseType());
+                dataDTO.setTestPlanDTOList(selectData.getTestPlanDTOList());
             }else {
                 dataDTO.setCaseName("");
                 dataDTO.setTestPlan("");
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
index d98af7894d..ad1f08d27f 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java
@@ -24,4 +24,7 @@ public class ApiScenarioRequest {
     private List<String> filters;
     private Map<String, Object> combine;
     private List<String> ids;
+    private boolean isSelectThisWeedData;
+    private long createTime = 0;
+    private String executeStatus;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/datacount/ExecutedCaseInfoResult.java b/backend/src/main/java/io/metersphere/api/dto/datacount/ExecutedCaseInfoResult.java
index 5edf645e52..e98e1be8c1 100644
--- a/backend/src/main/java/io/metersphere/api/dto/datacount/ExecutedCaseInfoResult.java
+++ b/backend/src/main/java/io/metersphere/api/dto/datacount/ExecutedCaseInfoResult.java
@@ -1,14 +1,18 @@
 package io.metersphere.api.dto.datacount;
 
+import io.metersphere.track.dto.TestPlanDTO;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 已执行的案例
  */
 @Getter
 @Setter
 public class ExecutedCaseInfoResult {
+    private String testCaseID;
     //案例名称
     private String caseName;
     //所属测试计划
@@ -17,4 +21,5 @@ public class ExecutedCaseInfoResult {
     private Long failureTimes;
     //案例类型
     private String caseType;
+    private List<TestPlanDTO> testPlanDTOList;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/datacount/response/ExecutedCaseInfoDTO.java b/backend/src/main/java/io/metersphere/api/dto/datacount/response/ExecutedCaseInfoDTO.java
index 0e31c47a16..e3437eedbf 100644
--- a/backend/src/main/java/io/metersphere/api/dto/datacount/response/ExecutedCaseInfoDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/datacount/response/ExecutedCaseInfoDTO.java
@@ -1,8 +1,11 @@
 package io.metersphere.api.dto.datacount.response;
 
+import io.metersphere.track.dto.TestPlanDTO;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 已执行的案例
  */
@@ -19,4 +22,8 @@ public class ExecutedCaseInfoDTO {
     private Long failureTimes;
     //案例类型
     private String caseType;
+    //案例ID
+    private String caseID;
+    //测试计划集合
+    private List<TestPlanDTO> testPlanDTOList;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
index ef2bb4d45a..4ec3cdd2d2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
+++ b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
@@ -15,6 +15,8 @@ public class TaskInfoResult {
     private String taskID;
     //场景名称
     private String scenario;
+    //场景ID
+    private String scenarioId;
     //规则
     private String rule;
     //任务状态
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
index 9c18000c7d..3073ed8300 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java
@@ -26,4 +26,8 @@ public class ApiDefinitionRequest {
     private List<String> filters;
     private Map<String, Object> combine;
     private List<String> ids;
+    private boolean isSelectThisWeedData = false;
+    private long createTime = 0;
+    private String status;
+    private String apiCaseCoverage;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
index ed87f0f263..d9028e23f2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
@@ -24,4 +24,6 @@ public class ApiTestCaseRequest {
     private List<String> moduleIds;
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
+    private boolean isSelectThisWeedData;
+    private long createTime = 0;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 9465a3caea..158fac6f3d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -75,6 +75,13 @@ public class ApiAutomationService {
 
     public List<ApiScenarioDTO> list(ApiScenarioRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        if(request.isSelectThisWeedData()){
+            Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
+            Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
+            if(weekFirstTime!=null){
+                request.setCreateTime(weekFirstTime.getTime());
+            }
+        }
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request);
         return list;
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 362781a4cf..1361a4506e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -10,7 +10,10 @@ import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.track.dto.TestPlanDTO;
+import io.metersphere.track.request.testcase.QueryTestPlanRequest;
 import io.metersphere.track.service.TestPlanApiCaseService;
+import io.metersphere.track.service.TestPlanService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +33,8 @@ public class ApiDefinitionExecResultService {
     private ExtApiDefinitionExecResultMapper extApiDefinitionExecResultMapper;
     @Resource
     private TestPlanApiCaseService testPlanApiCaseService;
+    @Resource
+    private TestPlanService testPlanService;
 
 
     public void saveApiResult(TestResult result, String type) {
@@ -100,9 +105,22 @@ public class ApiDefinitionExecResultService {
             List<ExecutedCaseInfoResult>list =  extApiDefinitionExecResultMapper.findFaliureCaseInfoByProjectIDAndExecuteTimeAndLimitNumber(projectId, startTime.getTime());
 
             List<ExecutedCaseInfoResult> returnList = new ArrayList<>(limitNumber);
+
             for(int i = 0;i<list.size();i++){
                 if(i<limitNumber){
-                    returnList.add(list.get(i));
+                    //开始遍历查询TestPlan信息 --> 提供前台做超链接
+                    ExecutedCaseInfoResult item = list.get(i);
+
+                    QueryTestPlanRequest planRequest = new QueryTestPlanRequest();
+                    planRequest.setProjectId(projectId);
+                    if("scenario".equals(item.getCaseType())){
+                        planRequest.setScenarioId(item.getTestCaseID());
+                    }else if("apiCase".equals(item.getCaseType())){
+                        planRequest.setApiId(item.getTestCaseID());
+                    }
+                    List<TestPlanDTO> dtoList = testPlanService.selectTestPlanByRelevancy(planRequest);
+                    item.setTestPlanDTOList(dtoList);
+                    returnList.add(item);
                 }else {
                     break;
                 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 5aa683ab4c..944b908847 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -78,6 +78,16 @@ public class ApiDefinitionService {
 
     public List<ApiDefinitionResult> list(ApiDefinitionRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+
+        //判断是否查询本周数据
+        if(request.isSelectThisWeedData()){
+            Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
+            Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
+            if(weekFirstTime!=null){
+                request.setCreateTime(weekFirstTime.getTime());
+            }
+        }
+
         List<ApiDefinitionResult> resList = extApiDefinitionMapper.list(request);
         calculateResult(resList);
         return resList;
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index 03f5b37b56..c86ad3508a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -78,6 +78,13 @@ public class ApiTestCaseService {
 
     public List<ApiTestCaseDTO> listSimple(ApiTestCaseRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        if(request.isSelectThisWeedData()){
+            Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
+            Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
+            if(weekFirstTime!=null){
+                request.setCreateTime(weekFirstTime.getTime());
+            }
+        }
         List<ApiTestCaseDTO> apiTestCases = extApiTestCaseMapper.listSimple(request);
         if (CollectionUtils.isEmpty(apiTestCases)) {
             return apiTestCases;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 82cdf50340..ea21de7289 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -34,7 +34,7 @@
 
     <select id="findFaliureCaseInfoByProjectIDAndExecuteTimeAndLimitNumber" resultType="io.metersphere.api.dto.datacount.ExecutedCaseInfoResult">
         SELECT * FROM (
-            SELECT testCase.testCaseName AS caseName,testCase.testPlanName AS testPlan ,caseErrorCountData.dataCountNumber AS failureTimes,'apiCase' AS caseType
+            SELECT testCase.testCaseID,testCase.testCaseName AS caseName,testCase.testPlanName AS testPlan ,caseErrorCountData.dataCountNumber AS failureTimes,'apiCase' AS caseType
             FROM (
             SELECT apiCase.id AS testCaseID,apiCase.`name` AS testCaseName,group_concat(testPlan.`name`)  AS testPlanName FROM api_test_case apiCase
            INNER JOIN test_plan_api_case testPlanCase ON testPlanCase.api_case_id = apiCase.id
@@ -50,20 +50,16 @@
             ) caseErrorCountData ON caseErrorCountData.testCaseID =testCase.testCaseID
             WHERE caseErrorCountData.executeTime >= #{startTimestamp}
             UNION
-            SELECT scene.`name` AS caseName,apiScene.testPlanName AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
+            SELECT scene.id AS testCaseID,scene.`name` AS caseName,apiScene.testPlanName AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
             FROM api_scenario_report report
-                     INNER JOIN api_scenario_report_detail reportDetail ON report.id = reportDetail.report_id
-                     INNER JOIN api_scenario scene ON report.scenario_id = scene.id
-                     INNER JOIN
-                 (
-                     SELECT
-                         apiScene.api_scenario_id,
-                         group_concat(testPlan.`name`) AS testPlanName
-                     FROM
-                         test_plan_api_scenario apiScene
-                             INNER JOIN test_plan testPlan ON testPlan.id = apiScene.test_plan_id
-                     GROUP BY apiScene.api_scenario_id
-                 )apiScene ON apiScene.api_scenario_id = scene.id
+            INNER JOIN api_scenario_report_detail reportDetail ON report.id = reportDetail.report_id
+            INNER JOIN api_scenario scene ON report.scenario_id = scene.id
+            INNER JOIN(
+                 SELECT apiScene.api_scenario_id, group_concat(testPlan.`name`) AS testPlanName
+                 FROM test_plan_api_scenario apiScene
+                 INNER JOIN test_plan testPlan ON testPlan.id = apiScene.test_plan_id
+                 GROUP BY apiScene.api_scenario_id
+             )apiScene ON apiScene.api_scenario_id = scene.id
             WHERE report.project_id = #{projectId}
               AND ( report.STATUS = 'Error' OR report.STATUS = 'Fail' )  AND report.create_time >= #{startTimestamp}
             GROUP BY scene.id
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 2ca103606a..b02cf6800e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -227,6 +227,9 @@
             <if test="request.userId != null">
                 AND api_definition.user_id = #{request.userId}
             </if>
+            <if test="request.createTime >0">
+                AND api_definition.create_time >= #{request.createTime}
+            </if>
             <if test="request.moduleId != null">
                 AND api_definition.module_id = #{request.moduleId}
             </if>
@@ -245,6 +248,16 @@
                     #{value}
                 </foreach>
             </if>
+            <if test="request.apiCaseCoverage == 'uncoverage' ">
+                and api_definition.id not in
+                (SELECT api_definition_id FROM api_test_case)
+            </if>
+            <if test="request.apiCaseCoverage == 'coverage' ">
+                and api_definition.id in
+                (SELECT api_definition_id FROM api_test_case)
+            </if>
+
+
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index ce4b0b3e29..0958a12dd2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -40,6 +40,9 @@
             <if test="request.projectId != null">
                 AND api_scenario.project_id = #{request.projectId}
             </if>
+            <if test="request.createTime >0 ">
+                AND api_scenario.create_time >= #{request.createTime}
+            </if>
             <if test="request.ids != null and request.ids.size() > 0">
                 AND api_scenario.id in
                 <foreach collection="request.ids" item="itemId" separator="," open="(" close=")">
@@ -58,6 +61,16 @@
                     #{value}
                 </foreach>
             </if>
+            <if test="request.executeStatus == 'unExecute'">
+                and api_scenario.last_result IS NULL
+            </if>
+            <if test="request.executeStatus == 'executeFailed'">
+                and api_scenario.last_result = 'Fail'
+            </if>
+            <if test="request.executeStatus == 'executePass'">
+                and api_scenario.last_result = 'Success'
+            </if>
+
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 6fa06d9a1b..eb430a6af5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -228,6 +228,9 @@
         <if test="request.projectId != null and request.projectId!=''">
             c.project_id = #{request.projectId}
         </if>
+        <if test="request.id != null and request.id!=''">
+            and c.id = #{request.id}
+        </if>
         <if test="request.ids != null and request.ids.size() > 0">
             <if test="request.projectId != null and request.projectId!=''">
                 and
@@ -240,6 +243,9 @@
         <if test="request.name != null and request.name!=''">
             and c.name like CONCAT('%', #{request.name},'%')
         </if>
+        <if test="request.createTime > 0">
+            and c.create_time >= #{request.createTime}
+        </if>
         <if test="request.moduleIds != null and request.moduleIds.size() > 0">
             and a.module_id in
             <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index 1b72bfc145..f494f2050d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -38,30 +38,19 @@
 
     <select id="countTaskByProjectId" resultType="java.lang.Long">
         SELECT COUNT(id) AS countNumber FROM `schedule` WHERE resource_id IN (
-            SELECT id FROM api_test WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash'
-            UNION
             SELECT id FROM api_scenario WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash'
             )
     </select>
     <select id="countTaskByProjectIdAndCreateTimeRange" resultType="java.lang.Long">
         SELECT COUNT(id) AS countNumber FROM `schedule`
         WHERE resource_id IN (
-            SELECT atest.id FROM api_test atest
-            WHERE atest.project_id = #{projectId,jdbcType=VARCHAR} AND atest.status != 'Trash'
-            UNION
             SELECT scene.id FROM api_scenario scene
             WHERE scene.project_id = #{projectId,jdbcType=VARCHAR} AND scene.status != 'Trash'
         )
         AND create_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="findRunningTaskInfoByProjectID" resultType="io.metersphere.api.dto.datacount.response.TaskInfoResult">
-        SELECT apiTest.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime
-        FROM api_test apiTest
-        INNER JOIN `schedule` sch ON apiTest.id = sch.resource_id
-        INNER JOIN `user` u ON u.id = sch.user_id
-        WHERE sch.`enable` = true AND apiTest.project_id = #{0,jdbcType=VARCHAR}
-        UNION
-        SELECT apiScene.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime
+        SELECT apiScene.id AS scenarioId,apiScene.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime
         FROM api_scenario apiScene
          INNER JOIN `schedule` sch ON apiScene.id = sch.resource_id
          INNER JOIN `user` u ON u.id = sch.user_id
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 6fc70898e2..9aa753f720 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -213,7 +213,7 @@
     <select id="selectTestPlanByRelevancy" resultMap="BaseResultMap" parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
         SELECT * FROM TEST_PLAN p LEFT JOIN test_plan_project t ON t.test_plan_id=p.id
         <where>
-            AND t.project_id = #{request.projectId}
+            AND (t.project_id = #{request.projectId} or p.project_id = #{request.projectId})
             <if test="request.scenarioId != null">
                 AND p.id IN (SELECT test_plan_id FROM test_plan_api_scenario WHERE api_scenario_id = #{request.scenarioId} )
             </if>
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 72a403bc9b..76d314a069 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -37,6 +37,7 @@ import io.metersphere.track.request.testcase.QueryTestPlanRequest;
 import io.metersphere.track.request.testplan.AddTestPlanRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -698,4 +699,7 @@ public class TestPlanService {
         }
         return issues;
     }
+    public List<TestPlanDTO> selectTestPlanByRelevancy(QueryTestPlanRequest params){
+        return  extTestPlanMapper.selectTestPlanByRelevancy(params);
+    }
 }
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 0f34f0d18c..fcc2f45bea 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-container>
+  <ms-container v-if="renderComponent">
     <ms-aside-container>
       <ms-api-scenario-module
         @nodeSelectEvent="nodeChange"
@@ -17,7 +17,10 @@
           <ms-api-scenario-list
             :select-node-ids="selectNodeIds"
             :trash-enable="trashEnable"
+            :checkRedirectID="checkRedirectID"
+            :isRedirectEdit="isRedirectEdit"
             @edit="editScenario"
+            @changeSelectDataRangeAll="changeSelectDataRangeAll"
             ref="apiScenarioList"/>
         </el-tab-pane>
 
@@ -28,7 +31,8 @@
           :name="item.name"
           closable>
           <div class="ms-api-scenario-div">
-            <ms-edit-api-scenario @refresh="refresh" :currentScenario="item.currentScenario" :moduleOptions="moduleOptions"/>
+            <ms-edit-api-scenario @refresh="refresh" :currentScenario="item.currentScenario"
+                                  :moduleOptions="moduleOptions"/>
           </div>
         </el-tab-pane>
 
@@ -44,92 +48,145 @@
 
 <script>
 
-  import MsContainer from "@/business/components/common/components/MsContainer";
-  import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
-  import MsMainContainer from "@/business/components/common/components/MsMainContainer";
-  import MsApiScenarioList from "@/business/components/api/automation/scenario/ApiScenarioList";
-  import {getUUID} from "@/common/js/utils";
-  import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
-  import MsEditApiScenario from "./scenario/EditApiScenario";
-  import {getCurrentProjectID} from "../../../../common/js/utils";
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+import MsApiScenarioList from "@/business/components/api/automation/scenario/ApiScenarioList";
+import {getUUID} from "@/common/js/utils";
+import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
+import MsEditApiScenario from "./scenario/EditApiScenario";
+import {getCurrentProjectID} from "../../../../common/js/utils";
 
-  export default {
-    name: "ApiAutomation",
-    components: {MsApiScenarioModule, MsApiScenarioList, MsMainContainer, MsAsideContainer, MsContainer, MsEditApiScenario},
-    comments: {},
-    data() {
-      return {
-        isHide: true,
-        activeName: 'default',
-        currentModule: null,
-        moduleOptions: {},
-        tabs: [],
-        trashEnable: false,
-        selectNodeIds: [],
+export default {
+  name: "ApiAutomation",
+  components: {
+    MsApiScenarioModule,
+    MsApiScenarioList,
+    MsMainContainer,
+    MsAsideContainer,
+    MsContainer,
+    MsEditApiScenario
+  },
+  comments: {},
+  computed: {
+    checkRedirectID: function () {
+      let redirectIDParam = this.$route.params.redirectID;
+      this.changeRedirectParam(redirectIDParam);
+      return redirectIDParam;
+    },
+    isRedirectEdit: function () {
+      let redirectParam = this.$route.params.dataSelectRange;
+      this.checkRedirectEditPage(redirectParam);
+      return redirectParam;
+    }
+  },
+  data() {
+    return {
+      redirectID: '',
+      renderComponent: true,
+      isHide: true,
+      activeName: 'default',
+      currentModule: null,
+      moduleOptions: {},
+      tabs: [],
+      trashEnable: false,
+      selectNodeIds: [],
+    }
+  },
+  watch: {
+    redirectID() {
+      this.renderComponent = false;
+      this.$nextTick(() => {
+        // 在 DOM 中添加 my-component 组件
+        this.renderComponent = true;
+      });
+    }
+  },
+  methods: {
+    checkRedirectEditPage(redirectParam) {
+      if(redirectParam!=null){
+        let selectParamArr = redirectParam.split("edit:");
+        if (selectParamArr.length == 2) {
+          let scenarioId = selectParamArr[1];
+          let projectId = getCurrentProjectID();
+          //查找单条数据，跳转修改页面
+          let url = "/api/automation/list/" + 1 + "/" + 1;
+          this.$post(url, {id:scenarioId,projectId:projectId}, response => {
+            let data = response.data;
+            if(data!=null){
+              let row = data.listObject[0];
+              this.editScenario(row);
+            }
+          });
+        }
       }
     },
-    watch: {},
-    methods: {
-      addTab(tab) {
-        if (!getCurrentProjectID()) {
-          this.$warning(this.$t('commons.check_project_tip'));
-          return;
-        }
-        if (tab.name === 'add') {
-          let label = this.$t('api_test.automation.add_scenario');
-          let name = getUUID().substring(0, 8);
-          this.activeName = name;
-          this.tabs.push({label: label, name: name, currentScenario: {apiScenarioModuleId: "", id: getUUID()}});
-        }
-        if (tab.name === 'edit') {
-          let label = this.$t('api_test.automation.add_scenario');
-          let name = getUUID().substring(0, 8);
-          this.activeName = name;
-          label = tab.currentScenario.name;
-          this.tabs.push({label: label, name: name, currentScenario: tab.currentScenario});
-        }
-      },
-      removeTab(targetName) {
-        this.tabs = this.tabs.filter(tab => tab.name !== targetName);
-        if (this.tabs.length > 0) {
-          this.activeName = this.tabs[this.tabs.length - 1].name;
-        } else {
-          this.activeName = "default"
-        }
-      },
-      setTabLabel(data) {
-        for (const tab of this.tabs) {
-          if (tab.name === this.activeName) {
-            tab.label = data.name;
-            break;
-          }
-        }
-      },
-      selectModule(data) {
-        this.currentModule = data;
-      },
-      saveScenario(data) {
-        this.setTabLabel(data);
-        this.$refs.apiScenarioList.search(data);
-      },
-      refresh(data) {
-        this.$refs.apiScenarioList.search(data);
-      },
-      editScenario(row) {
-        this.addTab({name: 'edit', currentScenario: row});
-      },
-
-      nodeChange(node, nodeIds, pNodes) {
-        this.selectNodeIds = nodeIds;
-      },
-      setModuleOptions(data) {
-        this.moduleOptions = data;
-      },
-      enableTrash(data) {
-        this.trashEnable = data;
+    changeRedirectParam(redirectIDParam) {
+      this.redirectID = redirectIDParam;
+    },
+    addTab(tab) {
+      if (!getCurrentProjectID()) {
+        this.$warning(this.$t('commons.check_project_tip'));
+        return;
       }
+      if (tab.name === 'add') {
+        let label = this.$t('api_test.automation.add_scenario');
+        let name = getUUID().substring(0, 8);
+        this.activeName = name;
+        this.tabs.push({label: label, name: name, currentScenario: {apiScenarioModuleId: "", id: getUUID()}});
+      }
+      if (tab.name === 'edit') {
+        let label = this.$t('api_test.automation.add_scenario');
+        let name = getUUID().substring(0, 8);
+        this.activeName = name;
+        label = tab.currentScenario.name;
+        this.tabs.push({label: label, name: name, currentScenario: tab.currentScenario});
+      }
+    },
+    removeTab(targetName) {
+      this.tabs = this.tabs.filter(tab => tab.name !== targetName);
+      if (this.tabs.length > 0) {
+        this.activeName = this.tabs[this.tabs.length - 1].name;
+      } else {
+        this.activeName = "default"
+      }
+    },
+    setTabLabel(data) {
+      for (const tab of this.tabs) {
+        if (tab.name === this.activeName) {
+          tab.label = data.name;
+          break;
+        }
+      }
+    },
+    selectModule(data) {
+      this.currentModule = data;
+    },
+    saveScenario(data) {
+      this.setTabLabel(data);
+      this.$refs.apiScenarioList.search(data);
+    },
+    refresh(data) {
+      this.$refs.apiScenarioList.search(data);
+    },
+    editScenario(row) {
+      this.addTab({name: 'edit', currentScenario: row});
+    },
+
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+    changeSelectDataRangeAll(tableType) {
+      this.$route.params.dataSelectRange = 'all';
+    },
+    enableTrash(data) {
+      this.trashEnable = data;
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 40d8541718..af60326fd4 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card class="table-card" v-loading="loading">
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="search" title=""
+        <ms-table-header :condition.sync="condition" @search="selectByParam" title=""
                          :show-create="false"/>
       </template>
 
@@ -16,10 +16,10 @@
               </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native.stop="isSelectDataAll(true)">
-                {{$t('api_test.batch_menus.select_all_data',[total])}}
+                {{ $t('api_test.batch_menus.select_all_data', [total]) }}
               </el-dropdown-item>
               <el-dropdown-item @click.native.stop="isSelectDataAll(false)">
-                {{$t('api_test.batch_menus.select_show_data',[tableData.length])}}
+                {{ $t('api_test.batch_menus.select_show_data', [tableData.length]) }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -143,6 +143,7 @@ export default {
       schedule: {},
       selection: [],
       tableData: [],
+      selectDataRange: 'all',
       currentPage: 1,
       pageSize: 10,
       total: 0,
@@ -193,8 +194,11 @@ export default {
     }
   },
   methods: {
+    selectByParam() {
+      this.changeSelectDataRangeAll();
+      this.search();
+    },
     search() {
-
       this.condition.filters = ["Prepare", "Underway", "Completed"];
       this.condition.moduleIds = this.selectNodeIds;
       if (this.trashEnable) {
@@ -205,6 +209,25 @@ export default {
       if (this.projectId != null) {
         this.condition.projectId = this.projectId;
       }
+
+      //检查是否只查询本周数据
+      this.condition.selectThisWeedData = false;
+      this.condition.executeStatus = null;
+      this.isSelectThissWeekData();
+      switch (this.selectDataRange){
+        case 'thisWeek':
+          this.condition.selectThisWeedData = true;
+          break;
+        case 'unExecute':
+          this.condition.executeStatus = 'unExecute';
+          break;
+        case 'executeFailed':
+          this.condition.executeStatus = 'executeFailed';
+          break;
+        case 'executePass':
+          this.condition.executeStatus = 'executePass';
+          break;
+      }
       this.selection = [];
 
       this.selectAll = false;
@@ -366,6 +389,14 @@ export default {
         this.selectDataCounts = this.selection.length;
       }
     },
+    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+    isSelectThissWeekData() {
+      let dataRange = this.$route.params.dataSelectRange;
+      this.selectDataRange = dataRange;
+    },
+    changeSelectDataRangeAll() {
+      this.$emit("changeSelectDataRangeAll");
+    },
     remove(row) {
       if (this.trashEnable) {
         this.$get('/api/automation/delete/' + row.id, () => {
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 4f6293dec4..cef7d04a7f 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-container>
+  <ms-container v-if="renderComponent">
     <ms-aside-container>
       <ms-api-module
         @nodeSelectEvent="nodeChange"
@@ -18,11 +18,12 @@
       <el-dropdown size="small" split-button type="primary" class="ms-api-buttion"
                    @click="handleCommand('ADD')"
                    @command="handleCommand" v-tester>
-        {{$t('commons.add')}}
+        {{ $t('commons.add') }}
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="debug">{{$t('api_test.definition.request.fast_debug')}}</el-dropdown-item>
-          <el-dropdown-item command="ADD">{{$t('api_test.definition.request.title')}}</el-dropdown-item>
-          <el-dropdown-item command="CLOSE_ALL">{{$t('api_test.definition.request.close_all_label')}}</el-dropdown-item>
+          <el-dropdown-item command="debug">{{ $t('api_test.definition.request.fast_debug') }}</el-dropdown-item>
+          <el-dropdown-item command="ADD">{{ $t('api_test.definition.request.title') }}</el-dropdown-item>
+          <el-dropdown-item command="CLOSE_ALL">{{ $t('api_test.definition.request.close_all_label') }}
+          </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
 
@@ -42,6 +43,9 @@
             :select-node-ids="selectNodeIds"
             :trash-enable="trashEnable"
             :is-api-list-enable="isApiListEnable"
+            :queryDataType="queryDataType"
+            :selectDataRange="selectDataRange"
+            @changeSelectDataRangeAll="changeSelectDataRangeAll"
             @editApi="editApi"
             @handleCase="handleCase"
             @showExecResult="showExecResult"
@@ -56,6 +60,8 @@
             :select-node-ids="selectNodeIds"
             :trash-enable="trashEnable"
             :is-api-list-enable="isApiListEnable"
+            :queryDataType="queryDataType"
+            @changeSelectDataRangeAll="changeSelectDataRangeAll"
             @isApiListEnableChange="isApiListEnableChange"
             @handleCase="handleCase"
             @showExecResult="showExecResult"
@@ -70,18 +76,26 @@
           </div>
           <!-- 快捷调试 -->
           <div v-else-if="item.type=== 'debug'" class="ms-api-div">
-            <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" v-if="currentProtocol==='HTTP'"/>
-            <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" v-if="currentProtocol==='SQL'"/>
-            <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" v-if="currentProtocol==='TCP'"/>
-            <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" v-if="currentProtocol==='DUBBO'"/>
+            <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                v-if="currentProtocol==='HTTP'"/>
+            <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                v-if="currentProtocol==='SQL'"/>
+            <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                               v-if="currentProtocol==='TCP'"/>
+            <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                 v-if="currentProtocol==='DUBBO'"/>
           </div>
 
           <!-- 测试-->
           <div v-else-if="item.type=== 'TEST'" class="ms-api-div">
-            <ms-run-test-http-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
-            <ms-run-test-tcp-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='TCP'"/>
-            <ms-run-test-sql-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='SQL'"/>
-            <ms-run-test-dubbo-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
+            <ms-run-test-http-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+                                   @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
+            <ms-run-test-tcp-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+                                  @refresh="refresh" v-if="currentProtocol==='TCP'"/>
+            <ms-run-test-sql-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+                                  @refresh="refresh" v-if="currentProtocol==='SQL'"/>
+            <ms-run-test-dubbo-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+                                    @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -89,276 +103,304 @@
   </ms-container>
 </template>
 <script>
-  import MsApiList from './components/list/ApiList';
-  import MsContainer from "../../common/components/MsContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
-  import MsAsideContainer from "../../common/components/MsAsideContainer";
-  import MsApiConfig from "./components/ApiConfig";
-  import MsDebugHttpPage from "./components/debug/DebugHttpPage";
-  import MsDebugJdbcPage from "./components/debug/DebugJdbcPage";
-  import MsDebugTcpPage from "./components/debug/DebugTcpPage";
-  import MsDebugDubboPage from "./components/debug/DebugDubboPage";
+import MsApiList from './components/list/ApiList';
+import MsContainer from "../../common/components/MsContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
+import MsAsideContainer from "../../common/components/MsAsideContainer";
+import MsApiConfig from "./components/ApiConfig";
+import MsDebugHttpPage from "./components/debug/DebugHttpPage";
+import MsDebugJdbcPage from "./components/debug/DebugJdbcPage";
+import MsDebugTcpPage from "./components/debug/DebugTcpPage";
+import MsDebugDubboPage from "./components/debug/DebugDubboPage";
 
-  import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
-  import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
-  import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
-  import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
-  import {downloadFile, getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import MsApiModule from "./components/module/ApiModule";
-  import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
-  import {PROJECT_NAME} from "../../../../common/js/constants";
+import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
+import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
+import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
+import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
+import {downloadFile, getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
+import MsApiModule from "./components/module/ApiModule";
+import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
+import {PROJECT_NAME} from "../../../../common/js/constants";
 
-  export default {
-    name: "ApiDefinition",
-    components: {
-      ApiCaseSimpleList,
-      MsApiModule,
-      MsApiList,
-      MsMainContainer,
-      MsContainer,
-      MsAsideContainer,
-      MsApiConfig,
-      MsDebugHttpPage,
-      MsRunTestHttpPage,
-      MsDebugJdbcPage,
-      MsDebugTcpPage,
-      MsDebugDubboPage,
-      MsRunTestTcpPage,
-      MsRunTestSqlPage,
-      MsRunTestDubboPage
+export default {
+  name: "ApiDefinition",
+  computed: {
+    queryDataType: function () {
+      let routeParam = this.$route.params.dataType;
+      let redirectIDParam = this.$route.params.redirectID;
+      this.changeRedirectParam(redirectIDParam);
+      if (routeParam === 'apiTestCase') {
+        this.isApiListEnableChange(false);
+      } else {
+        this.isApiListEnableChange(true);
+      }
+      return routeParam;
     },
-    props: {
-      visible: {
-        type: Boolean,
-        default: false,
-      },
-      currentRow: {
-        type: Object,
+  },
+  components: {
+    ApiCaseSimpleList,
+    MsApiModule,
+    MsApiList,
+    MsMainContainer,
+    MsContainer,
+    MsAsideContainer,
+    MsApiConfig,
+    MsDebugHttpPage,
+    MsRunTestHttpPage,
+    MsDebugJdbcPage,
+    MsDebugTcpPage,
+    MsDebugDubboPage,
+    MsRunTestTcpPage,
+    MsRunTestSqlPage,
+    MsRunTestDubboPage
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    currentRow: {
+      type: Object,
+    }
+  },
+  data() {
+    return {
+      redirectID: '',
+      renderComponent: true,
+      selectDataRange: 'all',
+      showCasePage: true,
+      apiDefaultTab: 'default',
+      currentProtocol: null,
+      currentModule: null,
+      selectNodeIds: [],
+      currentApi: {},
+      moduleOptions: {},
+      trashEnable: false,
+      apiTabs: [{
+        title: this.$t('api_test.definition.api_title'),
+        name: 'default',
+        type: "list",
+        closable: false
+      }],
+      isApiListEnable: true
+    }
+  },
+  watch: {
+    currentProtocol() {
+      this.handleCommand("CLOSE_ALL");
+    },
+    redirectID() {
+      this.renderComponent = false;
+      this.$nextTick(() => {
+        // 在 DOM 中添加 my-component 组件
+        this.renderComponent = true;
+      });
+    }
+  },
+  methods: {
+    changeRedirectParam(redirectIDParam) {
+      this.redirectID = redirectIDParam;
+    },
+    isApiListEnableChange(data) {
+      this.isApiListEnable = data;
+    },
+    handleCommand(e) {
+      switch (e) {
+        case "ADD":
+          this.handleTabAdd(e);
+          break;
+        case "TEST":
+          this.handleTabsEdit(this.$t("commons.api"), e);
+          break;
+        case "CLOSE_ALL":
+          this.handleTabClose();
+          break;
+        default:
+          this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug");
+          break;
       }
     },
-    data() {
-      return {
-        showCasePage: true,
-        apiDefaultTab: 'default',
-        currentProtocol: null,
-        currentModule: null,
-        selectNodeIds: [],
-        currentApi: {},
-        moduleOptions: {},
-        trashEnable: false,
-        apiTabs: [{
-          title: this.$t('api_test.definition.api_title'),
-          name: 'default',
-          type: "list",
-          closable: false
-        }],
-        isApiListEnable: true
+    handleTabAdd(e) {
+      if (!getCurrentProjectID()) {
+        this.$warning(this.$t('commons.check_project_tip'));
+        return;
       }
+      let api = {
+        status: "Underway", method: "GET", userId: getCurrentUser().id,
+        url: "", protocol: this.currentProtocol, environmentId: ""
+      };
+      this.handleTabsEdit(this.$t('api_test.definition.request.title'), e, api);
     },
-    watch: {
-      currentProtocol() {
-        this.handleCommand("CLOSE_ALL");
-      }
+    handleTabClose() {
+      let tabs = this.apiTabs[0];
+      this.apiTabs = [];
+      this.apiDefaultTab = tabs.name;
+      this.apiTabs.push(tabs);
+      this.refresh();
     },
-    methods: {
-      isApiListEnableChange(data) {
-        this.isApiListEnable = data;
-      },
-      handleCommand(e) {
-        switch (e) {
-          case "ADD":
-            this.handleTabAdd(e);
-            break;
-          case "TEST":
-            this.handleTabsEdit(this.$t("commons.api"), e);
-            break;
-          case "CLOSE_ALL":
-            this.handleTabClose();
-            break;
-          default:
-            this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug");
-            break;
-        }
-      },
-      handleTabAdd(e) {
-        if (!getCurrentProjectID()) {
-          this.$warning(this.$t('commons.check_project_tip'));
-          return;
-        }
-        let api = {
-          status: "Underway", method: "GET", userId: getCurrentUser().id,
-          url: "", protocol: this.currentProtocol, environmentId: ""
-        };
-        this.handleTabsEdit(this.$t('api_test.definition.request.title'), e, api);
-      },
-      handleTabClose() {
-        let tabs = this.apiTabs[0];
-        this.apiTabs = [];
-        this.apiDefaultTab = tabs.name;
-        this.apiTabs.push(tabs);
-        this.refresh();
-      },
-      handleTabRemove(targetName) {
-        let tabs = this.apiTabs;
-        let activeName = this.apiDefaultTab;
-        if (activeName === targetName) {
-          tabs.forEach((tab, index) => {
-            if (tab.name === targetName) {
-              let nextTab = tabs[index + 1] || tabs[index - 1];
-              if (nextTab) {
-                activeName = nextTab.name;
-              }
+    handleTabRemove(targetName) {
+      let tabs = this.apiTabs;
+      let activeName = this.apiDefaultTab;
+      if (activeName === targetName) {
+        tabs.forEach((tab, index) => {
+          if (tab.name === targetName) {
+            let nextTab = tabs[index + 1] || tabs[index - 1];
+            if (nextTab) {
+              activeName = nextTab.name;
             }
-          });
-        }
-        this.apiDefaultTab = activeName;
-        this.apiTabs = tabs.filter(tab => tab.name !== targetName);
-        this.refresh();
-      },
-      //创建左侧树的根目录模块
-      createRootModel(){
-        this.$refs.nodeTree.createRootModel();
-      },
-      handleTabsEdit(targetName, action, api) {
-        if (!getCurrentProjectID()) {
-          this.$warning(this.$t('commons.check_project_tip'));
-          return;
-        }
-        if (targetName === undefined || targetName === null) {
-          targetName = this.$t('api_test.definition.request.title');
-        }
-        let newTabName = getUUID();
-        this.apiTabs.push({
-          title: targetName,
-          name: newTabName,
-          closable: true,
-          type: action,
-          api: api,
+          }
         });
-        this.apiDefaultTab = newTabName;
-      },
-      debug(id) {
-        this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug", id);
-      },
-      editApi(row) {
-        let name = this.$t('api_test.definition.request.edit_api');
-        if (row.name) {
-          name = this.$t('api_test.definition.request.edit_api') + "-" + row.name;
-        }
-        this.handleTabsEdit(name, "ADD", row);
-      },
-      handleCase(api) {
-        this.currentApi = api;
-        this.showCasePage = false;
-      },
-      apiCaseClose() {
-        this.showCasePage = true;
-      },
-      exportAPI() {
-        if (!this.isApiListEnable) {
-          this.$warning('用例列表暂不支持导出，请切换成接口列表');
-          return;
-        }
-        let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
-        if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
-          let arr = Array.from(this.$refs.apiList[0].selectRows);
-          obj.data = arr;
+      }
+      this.apiDefaultTab = activeName;
+      this.apiTabs = tabs.filter(tab => tab.name !== targetName);
+      this.refresh();
+    },
+    //创建左侧树的根目录模块
+    createRootModel() {
+      this.$refs.nodeTree.createRootModel();
+    },
+    handleTabsEdit(targetName, action, api) {
+      if (!getCurrentProjectID()) {
+        this.$warning(this.$t('commons.check_project_tip'));
+        return;
+      }
+      if (targetName === undefined || targetName === null) {
+        targetName = this.$t('api_test.definition.request.title');
+      }
+      let newTabName = getUUID();
+      this.apiTabs.push({
+        title: targetName,
+        name: newTabName,
+        closable: true,
+        type: action,
+        api: api,
+      });
+      this.apiDefaultTab = newTabName;
+    },
+    debug(id) {
+      this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug", id);
+    },
+    editApi(row) {
+      let name = this.$t('api_test.definition.request.edit_api');
+      if (row.name) {
+        name = this.$t('api_test.definition.request.edit_api') + "-" + row.name;
+      }
+      this.handleTabsEdit(name, "ADD", row);
+    },
+    handleCase(api) {
+      this.currentApi = api;
+      this.showCasePage = false;
+    },
+    apiCaseClose() {
+      this.showCasePage = true;
+    },
+    exportAPI() {
+      if (!this.isApiListEnable) {
+        this.$warning('用例列表暂不支持导出，请切换成接口列表');
+        return;
+      }
+      let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
+      if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
+        let arr = Array.from(this.$refs.apiList[0].selectRows);
+        obj.data = arr;
+        this.buildApiPath(obj.data);
+        downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
+      } else {
+        let condition = {};
+        let url = "/api/definition/list/all";
+        condition.filters = ["Prepare", "Underway", "Completed"];
+        condition.projectId = getCurrentProjectID();
+        this.$post(url, condition, response => {
+          obj.data = response.data;
           this.buildApiPath(obj.data);
           downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
-        } else {
-          let condition = {};
-          let url = "/api/definition/list/all";
-          condition.filters = ["Prepare", "Underway", "Completed"];
-          condition.projectId = getCurrentProjectID();
-          this.$post(url, condition, response => {
-            obj.data = response.data;
-            this.buildApiPath(obj.data);
-            downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
-          });
-        }
-      },
-      buildApiPath(apis) {
-        apis.forEach((api) => {
-          this.moduleOptions.forEach(item => {
-            if (api.moduleId === item.id) {
-              api.modulePath = item.path;
-            }
-          });
         });
-      },
-      refresh(data) {
-        this.$refs.apiList[0].initTable(data);
-      },
-      setTabTitle(data) {
-        for (let index in this.apiTabs) {
-          let tab = this.apiTabs[index];
-          if (tab.name === this.apiDefaultTab) {
-            tab.title = this.$t('api_test.definition.request.edit_api') + "-" + data.name;
-            break;
-          }
-        }
-      },
-      runTest(data) {
-        this.setTabTitle(data);
-        this.handleTabsEdit(this.$t("commons.api"), "TEST", data);
-      },
-      saveApi(data) {
-        this.setTabTitle(data);
-        this.refresh(data);
-      },
-
-      showExecResult(row) {
-        this.debug(row);
-      },
-
-      nodeChange(node, nodeIds, pNodes) {
-        this.selectNodeIds = nodeIds;
-      },
-      handleProtocolChange(protocol) {
-        this.currentProtocol = protocol;
-      },
-      setModuleOptions(data) {
-        this.moduleOptions = data;
-      },
-      enableTrash(data) {
-        this.trashEnable = data;
       }
+    },
+    buildApiPath(apis) {
+      apis.forEach((api) => {
+        this.moduleOptions.forEach(item => {
+          if (api.moduleId === item.id) {
+            api.modulePath = item.path;
+          }
+        });
+      });
+    },
+    refresh(data) {
+      this.$refs.apiList[0].initTable(data);
+    },
+    setTabTitle(data) {
+      for (let index in this.apiTabs) {
+        let tab = this.apiTabs[index];
+        if (tab.name === this.apiDefaultTab) {
+          tab.title = this.$t('api_test.definition.request.edit_api') + "-" + data.name;
+          break;
+        }
+      }
+    },
+    runTest(data) {
+      this.setTabTitle(data);
+      this.handleTabsEdit(this.$t("commons.api"), "TEST", data);
+    },
+    saveApi(data) {
+      this.setTabTitle(data);
+      this.refresh(data);
+    },
+
+    showExecResult(row) {
+      this.debug(row);
+    },
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    handleProtocolChange(protocol) {
+      this.currentProtocol = protocol;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+    changeSelectDataRangeAll(tableType) {
+      this.$route.params.dataSelectRange = 'all';
+    },
+    enableTrash(data) {
+      this.trashEnable = data;
     }
   }
+}
 </script>
 
 <style scoped>
-  .ms-api-buttion {
-    position: absolute;
-    top: 100px;
-    right: 4px;
-    padding: 0;
-    background: 0 0;
-    border: none;
-    outline: 0;
-    cursor: pointer;
-    margin-right: 10px;
-    font-size: 16px;
-  }
+.ms-api-buttion {
+  position: absolute;
+  top: 100px;
+  right: 4px;
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: 0;
+  cursor: pointer;
+  margin-right: 10px;
+  font-size: 16px;
+}
 
-  .ms-api-div {
-    overflow-y: auto;
-    height: calc(100vh - 155px)
-  }
+.ms-api-div {
+  overflow-y: auto;
+  height: calc(100vh - 155px)
+}
 
-  /deep/ .el-tabs__header {
-    margin: 0 0 5px;
-    width: calc(100% - 90px);
-  }
+/deep/ .el-tabs__header {
+  margin: 0 0 5px;
+  width: calc(100% - 90px);
+}
 
-  /deep/ .el-main {
-    overflow: hidden;
-  }
+/deep/ .el-main {
+  overflow: hidden;
+}
 
-  /deep/ .el-card {
-    /*border: 1px solid #EBEEF5;*/
-    /*border-style: none;*/
-    border-top: none;
-  }
+/deep/ .el-card {
+  /*border: 1px solid #EBEEF5;*/
+  /*border-style: none;*/
+  border-top: none;
+}
 
 </style>
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index dad5520ea2..36487c1b62 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -4,7 +4,8 @@
       :is-api-list-enable="isApiListEnable"
       @isApiListEnableChange="isApiListEnableChange">
 
-      <el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
+      <el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small"
+                v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
                 ref="caseTable"
@@ -22,10 +23,10 @@
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native.stop="isSelectDataAll(true)">
-                {{$t('api_test.batch_menus.select_all_data',[total])}}
+                {{ $t('api_test.batch_menus.select_all_data', [total]) }}
               </el-dropdown-item>
               <el-dropdown-item @click.native.stop="isSelectDataAll(false)">
-                {{$t('api_test.batch_menus.select_show_data',[tableData.length])}}
+                {{ $t('api_test.batch_menus.select_show_data', [tableData.length]) }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -72,8 +73,10 @@
         <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
           <template v-slot:default="scope">
             <!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>-->
-            <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{$t('commons.edit')}}</el-button>
-            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{$t('commons.delete')}}</el-button>
+            <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}
+            </el-button>
+            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{ $t('commons.delete') }}
+            </el-button>
           </template>
         </el-table-column>
 
@@ -91,353 +94,382 @@
 
 <script>
 
-  import MsTableOperator from "../../../../common/components/MsTableOperator";
-  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-  import MsTablePagination from "../../../../common/pagination/TablePagination";
-  import MsTag from "../../../../common/components/MsTag";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-  import MsBatchEdit from "../basis/BatchEdit";
-  import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../model/JsonData";
-  import {getCurrentProjectID} from "@/common/js/utils";
-  import ApiListContainer from "./ApiListContainer";
-  import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
-  import ApiCaseList from "../case/ApiCaseList";
-  import {_filter, _sort} from "../../../../../../common/js/utils";
-  import TestPlanCaseListHeader from "../../../../track/plan/view/comonents/api/TestPlanCaseListHeader";
-  import MsEnvironmentSelect from "../case/MsEnvironmentSelect";
-  import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+import MsTablePagination from "../../../../common/pagination/TablePagination";
+import MsTag from "../../../../common/components/MsTag";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+import MsBatchEdit from "../basis/BatchEdit";
+import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../model/JsonData";
+import {getCurrentProjectID} from "@/common/js/utils";
+import ApiListContainer from "./ApiListContainer";
+import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
+import ApiCaseList from "../case/ApiCaseList";
+import {_filter, _sort} from "../../../../../../common/js/utils";
+import TestPlanCaseListHeader from "../../../../track/plan/view/comonents/api/TestPlanCaseListHeader";
+import MsEnvironmentSelect from "../case/MsEnvironmentSelect";
+import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
 
-  export default {
-    name: "ApiCaseSimpleList",
-    components: {
-      ApiCaseList,
-      PriorityTableItem,
-      ApiListContainer,
-      MsTableOperatorButton,
-      MsTableOperator,
-      MsTablePagination,
-      MsTag,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      ShowMoreBtn,
-      MsBatchEdit
+export default {
+  name: "ApiCaseSimpleList",
+  components: {
+    ApiCaseList,
+    PriorityTableItem,
+    ApiListContainer,
+    MsTableOperatorButton,
+    MsTableOperator,
+    MsTablePagination,
+    MsTag,
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    ShowMoreBtn,
+    MsBatchEdit
+  },
+  data() {
+    return {
+      condition: {},
+      selectCase: {},
+      result: {},
+      moduleId: "",
+      selectDataRange: "all",
+      deletePath: "/test/case/delete",
+      selectRows: new Set(),
+      buttons: [
+        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+        {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
+      ],
+      typeArr: [
+        {id: 'priority', name: this.$t('test_track.case.priority')},
+      ],
+      priorityFilters: [
+        {text: 'P0', value: 'P0'},
+        {text: 'P1', value: 'P1'},
+        {text: 'P2', value: 'P2'},
+        {text: 'P3', value: 'P3'}
+      ],
+      valueArr: {
+        priority: CASE_PRIORITY,
+      },
+      methodColorMap: new Map(API_METHOD_COLOUR),
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      screenHeight: document.documentElement.clientHeight - 330,//屏幕高度
+      environmentId: undefined,
+      selectAll: false,
+      unSelection: [],
+      selectDataCounts: 0,
+    }
+  },
+  props: {
+    currentProtocol: String,
+    selectNodeIds: Array,
+    visible: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-      return {
-        condition: {},
-        selectCase: {},
-        result: {},
-        moduleId: "",
-        deletePath: "/test/case/delete",
-        selectRows: new Set(),
-        buttons: [
-          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
-          {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
-        ],
-        typeArr: [
-          {id: 'priority', name: this.$t('test_track.case.priority')},
-        ],
-        priorityFilters: [
-          {text: 'P0', value: 'P0'},
-          {text: 'P1', value: 'P1'},
-          {text: 'P2', value: 'P2'},
-          {text: 'P3', value: 'P3'}
-        ],
-        valueArr: {
-          priority: CASE_PRIORITY,
-        },
-        methodColorMap: new Map(API_METHOD_COLOUR),
-        tableData: [],
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        screenHeight: document.documentElement.clientHeight - 330,//屏幕高度
-        environmentId: undefined,
-        selectAll: false,
-        unSelection:[],
-        selectDataCounts:0,
+    trashEnable: {
+      type: Boolean,
+      default: false,
+    },
+    isApiListEnable: {
+      type: Boolean,
+      default: false,
+    },
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+    isCaseRelevance: {
+      type: Boolean,
+      default: false,
+    },
+    relevanceProjectId: String,
+    model: {
+      type: String,
+      default() {
+        'api'
       }
     },
-    props: {
-      currentProtocol: String,
-      selectNodeIds: Array,
-      visible: {
-        type: Boolean,
-        default: false,
-      },
-      trashEnable: {
-        type: Boolean,
-        default: false,
-      },
-      isApiListEnable: {
-        type: Boolean,
-        default: false,
-      },
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
-      isCaseRelevance: {
-        type: Boolean,
-        default: false,
-      },
-      relevanceProjectId: String,
-      model: {
-        type: String,
-        default() {
-          'api'
-        }
-      },
-      planId: String
-    },
-    created: function () {
+    planId: String
+  },
+  created: function () {
+    this.initTable();
+  },
+  watch: {
+    selectNodeIds() {
       this.initTable();
     },
-    watch: {
-      selectNodeIds() {
-        this.initTable();
-      },
-      currentProtocol() {
-        this.initTable();
-      },
-      trashEnable() {
-        if (this.trashEnable) {
-          this.initTable();
-        }
-      },
-      relevanceProjectId() {
+    currentProtocol() {
+      this.initTable();
+    },
+    trashEnable() {
+      if (this.trashEnable) {
         this.initTable();
       }
     },
-    computed: {
+    relevanceProjectId() {
+      this.initTable();
+    }
+  },
+  computed: {
 
-      // 接口定义用例列表
-      isApiModel() {
-        return this.model === 'api'
-      },
+    // 接口定义用例列表
+    isApiModel() {
+      return this.model === 'api'
     },
-    methods: {
-      isApiListEnableChange(data) {
-        this.$emit('isApiListEnableChange', data);
-      },
-      initTable() {
-        this.selectRows = new Set();
-        this.condition.status = "";
-        this.condition.moduleIds = this.selectNodeIds;
-        if (this.trashEnable) {
-          this.condition.status = "Trash";
-          this.condition.moduleIds = [];
-        }
-        this.selectAll  = false;
-        this.unSelection = [];
-        this.selectDataCounts = 0;
-        this.condition.projectId = getCurrentProjectID();
+  },
+  methods: {
+    isApiListEnableChange(data) {
+      this.$emit('isApiListEnableChange', data);
+    },
+    initTable() {
+      this.selectRows = new Set();
+      this.condition.status = "";
+      this.condition.moduleIds = this.selectNodeIds;
+      if (this.trashEnable) {
+        this.condition.status = "Trash";
+        this.condition.moduleIds = [];
+      }
+      this.selectAll = false;
+      this.unSelection = [];
+      this.selectDataCounts = 0;
+      this.condition.projectId = getCurrentProjectID();
 
-        if (this.currentProtocol != null) {
-          this.condition.protocol = this.currentProtocol;
+      if (this.currentProtocol != null) {
+        this.condition.protocol = this.currentProtocol;
+      }
+
+      //检查是否只查询本周数据
+      this.isSelectThissWeekData();
+      this.condition.selectThisWeedData = false;
+      this.condition.id = null;
+      if (this.selectDataRange == 'thisWeekCount') {
+        this.condition.selectThisWeedData = true;
+      } else if (this.selectDataRange != null) {
+        let selectParamArr = this.selectDataRange.split("single:");
+
+        if (selectParamArr.length == 2) {
+          this.condition.id = selectParamArr[1];
         }
-        if (this.condition.projectId) {
-          this.result = this.$post('/api/testcase/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
-            this.total = response.data.itemCount;
-            this.tableData = response.data.listObject;
-            this.unSelection = response.data.listObject.map(s=>s.id);
-          });
+      }
+
+      if (this.condition.projectId) {
+        this.result = this.$post('/api/testcase/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+          this.unSelection = response.data.listObject.map(s => s.id);
+        });
+      }
+    },
+    // getMaintainerOptions() {
+    //   let workspaceId = localStorage.getItem(WORKSPACE_ID);
+    //   this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+    //     this.valueArr.userId = response.data;
+    //   });
+    // },
+    handleSelect(selection, row) {
+      _handleSelect(this, selection, row, this.selectRows);
+      this.selectRowsCount(this.selectRows)
+    },
+    showExecResult(row) {
+      this.visible = false;
+      this.$emit('showExecResult', row);
+    },
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.initTable();
+    },
+    sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
+      _sort(column, this.condition);
+      this.initTable();
+    },
+    handleSelectAll(selection) {
+      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      this.selectRowsCount(this.selectRows)
+    },
+    search() {
+      this.changeSelectDataRangeAll();
+      this.initTable();
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
+
+    handleTestCase(testCase) {
+      this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
+        let api = response.data;
+        let selectApi = api;
+        let request = {};
+        if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+          request = api.request;
+        } else {
+          request = JSON.parse(api.request);
         }
-      },
-      // getMaintainerOptions() {
-      //   let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      //   this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-      //     this.valueArr.userId = response.data;
+        if (!request.hashTree) {
+          request.hashTree = [];
+        }
+        selectApi.url = request.path;
+        this.$refs.caseList.open(selectApi, testCase.id);
+      });
+    },
+    reductionApi(row) {
+      let ids = [row.id];
+      this.$post('/api/testcase/reduction/', ids, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.search();
+      });
+    },
+    handleDeleteBatch() {
+      // if (this.trashEnable) {
+      this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            let obj = {};
+            obj.projectId = getCurrentProjectID();
+            obj.selectAllDate = this.isSelectAllDate;
+            obj.unSelectIds = this.unSelection;
+            obj.ids = Array.from(this.selectRows).map(row => row.id);
+            obj = Object.assign(obj, this.condition);
+            this.$post('/api/testcase/deleteBatchByParam/', obj, () => {
+              this.selectRows.clear();
+              this.initTable();
+              this.$success(this.$t('commons.delete_success'));
+            });
+          }
+        }
+      });
+      // } else {
+      //   this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+      //     confirmButtonText: this.$t('commons.confirm'),
+      //     callback: (action) => {
+      //       if (action === 'confirm') {
+      //         let ids = Array.from(this.selectRows).map(row => row.id);
+      //         this.$post('/api/testcase/removeToGc/', ids, () => {
+      //           this.selectRows.clear();
+      //           this.initTable();
+      //           this.$success(this.$t('commons.delete_success'));
+      //         });
+      //       }
+      //     }
       //   });
-      // },
-      handleSelect(selection, row) {
-        _handleSelect(this, selection, row, this.selectRows);
-        this.selectRowsCount(this.selectRows)
-      },
-      showExecResult(row) {
-        this.visible = false;
-        this.$emit('showExecResult', row);
-      },
-      filter(filters) {
-        _filter(filters, this.condition);
-        this.initTable();
-      },
-      sort(column) {
-        // 每次只对一个字段排序
-        if (this.condition.orders) {
-          this.condition.orders = [];
-        }
-        _sort(column, this.condition);
-        this.initTable();
-      },
-      handleSelectAll(selection) {
-        _handleSelectAll(this, selection, this.tableData, this.selectRows);
-        this.selectRowsCount(this.selectRows)
-      },
-      search() {
-        this.initTable();
-      },
-      buildPagePath(path) {
-        return path + "/" + this.currentPage + "/" + this.pageSize;
-      },
+      // }
+    },
+    handleEditBatch() {
+      this.$refs.batchEdit.open();
+    },
+    batchEdit(form) {
+      let arr = Array.from(this.selectRows);
+      let ids = arr.map(row => row.id);
+      let param = {};
+      param[form.type] = form.value;
+      param.ids = ids;
 
-      handleTestCase(testCase) {
-        this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
-          let api = response.data;
-          let selectApi = api;
-          let request = {};
-          if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-            request = api.request;
-          } else {
-            request = JSON.parse(api.request);
-          }
-          if (!request.hashTree) {
-            request.hashTree = [];
-          }
-          selectApi.url = request.path;
-          this.$refs.caseList.open(selectApi, testCase.id);
-        });
-      },
-      reductionApi(row) {
-        let ids = [row.id];
-        this.$post('/api/testcase/reduction/', ids, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.search();
-        });
-      },
-      handleDeleteBatch() {
-        // if (this.trashEnable) {
-          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-            confirmButtonText: this.$t('commons.confirm'),
-            callback: (action) => {
-              if (action === 'confirm') {
-                let obj = {};
-                obj.projectId = getCurrentProjectID();
-                obj.selectAllDate = this.isSelectAllDate;
-                obj.unSelectIds = this.unSelection;
-                obj.ids = Array.from(this.selectRows).map(row => row.id);
-                obj = Object.assign(obj, this.condition);
-                this.$post('/api/testcase/deleteBatchByParam/', obj , () => {
-                  this.selectRows.clear();
-                  this.initTable();
-                  this.$success(this.$t('commons.delete_success'));
-                });
-              }
-            }
-          });
-        // } else {
-        //   this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-        //     confirmButtonText: this.$t('commons.confirm'),
-        //     callback: (action) => {
-        //       if (action === 'confirm') {
-        //         let ids = Array.from(this.selectRows).map(row => row.id);
-        //         this.$post('/api/testcase/removeToGc/', ids, () => {
-        //           this.selectRows.clear();
-        //           this.initTable();
-        //           this.$success(this.$t('commons.delete_success'));
-        //         });
-        //       }
-        //     }
-        //   });
-        // }
-      },
-      handleEditBatch() {
-        this.$refs.batchEdit.open();
-      },
-      batchEdit(form) {
-        let arr = Array.from(this.selectRows);
-        let ids = arr.map(row => row.id);
-        let param = {};
-        param[form.type] = form.value;
-        param.ids = ids;
-
-        param.projectId = getCurrentProjectID();
-        param.selectAllDate = this.isSelectAllDate;
-        param.unSelectIds = this.unSelection;
-        param = Object.assign(param, this.condition);
-        this.$post('/api/testcase/batch/editByParam', param, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.initTable();
-        });
-      },
-      handleDelete(apiCase) {
-        // if (this.trashEnable) {
-          this.$get('/api/testcase/delete/' + apiCase.id, () => {
-            this.$success(this.$t('commons.delete_success'));
-            this.initTable();
-          });
-          return;
-        // }
-        // this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + apiCase.name + " ？", '', {
-        //   confirmButtonText: this.$t('commons.confirm'),
-        //   callback: (action) => {
-        //     if (action === 'confirm') {
-        //       let ids = [apiCase.id];
-        //       this.$post('/api/testcase/removeToGc/', ids, () => {
-        //         this.$success(this.$t('commons.delete_success'));
-        //         this.initTable();
-        //       });
-        //     }
-        //   }
-        // });
-      },
-      setEnvironment(data) {
-        this.environmentId = data.id;
-      },
-      selectRowsCount(selection){
-        let selectedIDs = this.getIds(selection);
-        let allIDs = this.tableData.map(s=>s.id);
-        this.unSelection = allIDs.filter(function (val) {
-          return selectedIDs.indexOf(val) === -1
-        });
-        if(this.isSelectAllDate){
-          this.selectDataCounts =this.total - this.unSelection.length;
-        }else {
-          this.selectDataCounts =selection.size;
-        }
-      },
-      isSelectDataAll(dataType) {
-        this.isSelectAllDate = dataType;
-        this.selectRowsCount(this.selectRows)
-        //如果已经全选，不需要再操作了
-        if (this.selectRows.size != this.tableData.length) {
-          this.$refs.caseTable.toggleAllSelection(true);
-        }
-      },
-      getIds(rowSets){
-        let rowArray = Array.from(rowSets)
-        let ids =  rowArray.map(s=>s.id);
-        return ids;
+      param.projectId = getCurrentProjectID();
+      param.selectAllDate = this.isSelectAllDate;
+      param.unSelectIds = this.unSelection;
+      param = Object.assign(param, this.condition);
+      this.$post('/api/testcase/batch/editByParam', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.initTable();
+      });
+    },
+    handleDelete(apiCase) {
+      // if (this.trashEnable) {
+      this.$get('/api/testcase/delete/' + apiCase.id, () => {
+        this.$success(this.$t('commons.delete_success'));
+        this.initTable();
+      });
+      return;
+      // }
+      // this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + apiCase.name + " ？", '', {
+      //   confirmButtonText: this.$t('commons.confirm'),
+      //   callback: (action) => {
+      //     if (action === 'confirm') {
+      //       let ids = [apiCase.id];
+      //       this.$post('/api/testcase/removeToGc/', ids, () => {
+      //         this.$success(this.$t('commons.delete_success'));
+      //         this.initTable();
+      //       });
+      //     }
+      //   }
+      // });
+    },
+    setEnvironment(data) {
+      this.environmentId = data.id;
+    },
+    selectRowsCount(selection) {
+      let selectedIDs = this.getIds(selection);
+      let allIDs = this.tableData.map(s => s.id);
+      this.unSelection = allIDs.filter(function (val) {
+        return selectedIDs.indexOf(val) === -1
+      });
+      if (this.isSelectAllDate) {
+        this.selectDataCounts = this.total - this.unSelection.length;
+      } else {
+        this.selectDataCounts = selection.size;
       }
     },
-  }
+    isSelectDataAll(dataType) {
+      this.isSelectAllDate = dataType;
+      this.selectRowsCount(this.selectRows)
+      //如果已经全选，不需要再操作了
+      if (this.selectRows.size != this.tableData.length) {
+        this.$refs.caseTable.toggleAllSelection(true);
+      }
+    },
+    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+    isSelectThissWeekData() {
+      this.selectDataRange = "all";
+      let routeParam = this.$route.params.dataSelectRange;
+      let dataType = this.$route.params.dataType;
+      if (dataType === 'apiTestCase') {
+        this.selectDataRange = routeParam;
+      }
+    },
+    changeSelectDataRangeAll() {
+      this.$emit("changeSelectDataRangeAll", "testCase");
+    },
+    getIds(rowSets) {
+      let rowArray = Array.from(rowSets)
+      let ids = rowArray.map(s => s.id);
+      return ids;
+    }
+  },
+}
 </script>
 
 <style scoped>
-  .operate-button > div {
-    display: inline-block;
-    margin-left: 10px;
-  }
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
 
-  .request-method {
-    padding: 0 5px;
-    color: #1E90FF;
-  }
+.request-method {
+  padding: 0 5px;
+  color: #1E90FF;
+}
 
-  .api-el-tag {
-    color: white;
-  }
+.api-el-tag {
+  color: white;
+}
 
-  .search-input {
-    float: right;
-    width: 300px;
-    /*margin-bottom: 20px;*/
-    margin-right: 20px;
-  }
+.search-input {
+  float: right;
+  width: 300px;
+  /*margin-bottom: 20px;*/
+  margin-right: 20px;
+}
 
 </style>
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 433b6f231d..c741b087ca 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
     <api-list-container
-      :is-api-list-enable="isApiListEnable"
-      @isApiListEnableChange="isApiListEnableChange">
+        :is-api-list-enable="isApiListEnable"
+        @isApiListEnableChange="isApiListEnableChange">
 
-      <el-input placeholder="搜索" @blur="search" class="search-input" size="small" @keyup.enter.native="search" v-model="condition.name"/>
+      <el-input placeholder="搜索" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
+                v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
                 ref="apiDefinitionTable"
@@ -21,10 +22,10 @@
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native.stop="isSelectDataAll(true)">
-                {{$t('api_test.batch_menus.select_all_data',[total])}}
+                {{ $t('api_test.batch_menus.select_all_data', [total]) }}
               </el-dropdown-item>
               <el-dropdown-item @click.native.stop="isSelectDataAll(false)">
-                {{$t('api_test.batch_menus.select_show_data',[tableData.length])}}
+                {{ $t('api_test.batch_menus.select_show_data', [tableData.length]) }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -36,38 +37,43 @@
         <el-table-column prop="num" label="ID" show-overflow-tooltip/>
         <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
         <el-table-column
-          prop="status"
-          column-key="api_status"
-          :label="$t('api_test.definition.api_status')"
-          show-overflow-tooltip>
+            prop="status"
+            column-key="api_status"
+            :label="$t('api_test.definition.api_status')"
+            show-overflow-tooltip>
           <template v-slot:default="scope">
-            <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain" :content="$t('test_track.plan.plan_status_prepare')"/>
-            <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain" :content="$t('test_track.plan.plan_status_running')"/>
-            <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain" :content="$t('test_track.plan.plan_status_completed')"/>
+            <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain"
+                    :content="$t('test_track.plan.plan_status_prepare')"/>
+            <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain"
+                    :content="$t('test_track.plan.plan_status_running')"/>
+            <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain"
+                    :content="$t('test_track.plan.plan_status_completed')"/>
             <ms-tag v-if="scope.row.status == 'Trash'" type="danger" effect="plain" content="废弃"/>
           </template>
         </el-table-column>
 
         <el-table-column
-          prop="method"
-          :label="$t('api_test.definition.api_type')"
-          show-overflow-tooltip>
+            prop="method"
+            :label="$t('api_test.definition.api_type')"
+            show-overflow-tooltip>
           <template v-slot:default="scope" class="request-method">
-            <el-tag size="mini" :style="{'background-color': getColor(true, scope.row.method), border: getColor(true, scope.row.method)}" class="api-el-tag">
-              {{ scope.row.method}}
+            <el-tag size="mini"
+                    :style="{'background-color': getColor(true, scope.row.method), border: getColor(true, scope.row.method)}"
+                    class="api-el-tag">
+              {{ scope.row.method }}
             </el-tag>
           </template>
         </el-table-column>
 
         <el-table-column
-          prop="path"
-          :label="$t('api_test.definition.api_path')"
-          show-overflow-tooltip/>
+            prop="path"
+            :label="$t('api_test.definition.api_path')"
+            show-overflow-tooltip/>
 
         <el-table-column
-          prop="userName"
-          :label="$t('api_test.definition.api_principal')"
-          show-overflow-tooltip/>
+            prop="userName"
+            :label="$t('api_test.definition.api_principal')"
+            show-overflow-tooltip/>
 
         <el-table-column width="160" :label="$t('api_test.definition.api_last_time')" prop="updateTime">
           <template v-slot:default="scope">
@@ -76,26 +82,31 @@
         </el-table-column>
 
         <el-table-column
-          prop="caseTotal"
-          :label="$t('api_test.definition.api_case_number')"
-          show-overflow-tooltip/>
+            prop="caseTotal"
+            :label="$t('api_test.definition.api_case_number')"
+            show-overflow-tooltip/>
 
         <el-table-column
-          prop="caseStatus"
-          :label="$t('api_test.definition.api_case_status')"
-          show-overflow-tooltip/>
+            prop="caseStatus"
+            :label="$t('api_test.definition.api_case_status')"
+            show-overflow-tooltip/>
 
         <el-table-column
-          prop="casePassingRate"
-          :label="$t('api_test.definition.api_case_passing_rate')"
-          show-overflow-tooltip/>
+            prop="casePassingRate"
+            :label="$t('api_test.definition.api_case_passing_rate')"
+            show-overflow-tooltip/>
 
         <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
           <template v-slot:default="scope">
-            <el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable" v-tester>{{$t('commons.reduction')}}</el-button>
-            <el-button type="text" @click="editApi(scope.row)" v-else v-tester>{{$t('commons.edit')}}</el-button>
-            <el-button type="text" @click="handleTestCase(scope.row)">{{$t('api_test.definition.request.case')}}</el-button>
-            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C" v-tester>{{$t('commons.delete')}}</el-button>
+            <el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable" v-tester>
+              {{ $t('commons.reduction') }}
+            </el-button>
+            <el-button type="text" @click="editApi(scope.row)" v-else v-tester>{{ $t('commons.edit') }}</el-button>
+            <el-button type="text" @click="handleTestCase(scope.row)">{{ $t('api_test.definition.request.case') }}
+            </el-button>
+            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C" v-tester>
+              {{ $t('commons.delete') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -111,392 +122,437 @@
 
 <script>
 
-  import MsTableHeader from '../../../../common/components/MsTableHeader';
-  import MsTableOperator from "../../../../common/components/MsTableOperator";
-  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-  import MsTableButton from "../../../../common/components/MsTableButton";
-  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-  import MsTablePagination from "../../../../common/pagination/TablePagination";
-  import MsTag from "../../../../common/components/MsTag";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-  import MsBatchEdit from "../basis/BatchEdit";
-  import {API_METHOD_COLOUR, REQ_METHOD, API_STATUS} from "../../model/JsonData";
-  import {getCurrentProjectID} from "@/common/js/utils";
-  import {WORKSPACE_ID} from '../../../../../../common/js/constants';
-  import ApiListContainer from "./ApiListContainer";
+import MsTableHeader from '../../../../common/components/MsTableHeader';
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+import MsTableButton from "../../../../common/components/MsTableButton";
+import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+import MsTablePagination from "../../../../common/pagination/TablePagination";
+import MsTag from "../../../../common/components/MsTag";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+import MsBatchEdit from "../basis/BatchEdit";
+import {API_METHOD_COLOUR, REQ_METHOD, API_STATUS} from "../../model/JsonData";
+import {getCurrentProjectID} from "@/common/js/utils";
+import {WORKSPACE_ID} from '../../../../../../common/js/constants';
+import ApiListContainer from "./ApiListContainer";
 
-  export default {
-    name: "ApiList",
-    components: {
-      ApiListContainer,
-      MsTableButton,
-      MsTableOperatorButton,
-      MsTableOperator,
-      MsTableHeader,
-      MsTablePagination,
-      MsTag,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      ShowMoreBtn,
-      MsBatchEdit
+export default {
+  name: "ApiList",
+  components: {
+    ApiListContainer,
+    MsTableButton,
+    MsTableOperatorButton,
+    MsTableOperator,
+    MsTableHeader,
+    MsTablePagination,
+    MsTag,
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    ShowMoreBtn,
+    MsBatchEdit
+  },
+  data() {
+    return {
+      condition: {},
+      selectApi: {},
+      result: {},
+      moduleId: "",
+      selectDataRange: "all",
+      deletePath: "/test/case/delete",
+      selectRows: new Set(),
+      buttons: [
+        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+        {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
+      ],
+      typeArr: [
+        {id: 'status', name: this.$t('api_test.definition.api_status')},
+        {id: 'method', name: this.$t('api_test.definition.api_type')},
+        {id: 'userId', name: this.$t('api_test.definition.api_principal')},
+      ],
+      valueArr: {
+        status: API_STATUS,
+        method: REQ_METHOD,
+        userId: [],
+      },
+      methodColorMap: new Map(API_METHOD_COLOUR),
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      screenHeight: document.documentElement.clientHeight - 330,//屏幕高度,
+      environmentId: undefined,
+      selectAll: false,
+      unSelection: [],
+      selectDataCounts: 0,
+    }
+  },
+  props: {
+    currentProtocol: String,
+    selectNodeIds: Array,
+    isSelectThisWeek: String,
+    visible: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-      return {
-        condition: {},
-        selectApi: {},
-        result: {},
-        moduleId: "",
-        deletePath: "/test/case/delete",
-        selectRows: new Set(),
-        buttons: [
-          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
-          {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
-        ],
-        typeArr: [
-          {id: 'status', name: this.$t('api_test.definition.api_status')},
-          {id: 'method', name: this.$t('api_test.definition.api_type')},
-          {id: 'userId', name: this.$t('api_test.definition.api_principal')},
-        ],
-        valueArr: {
-          status: API_STATUS,
-          method: REQ_METHOD,
-          userId: [],
-        },
-        methodColorMap: new Map(API_METHOD_COLOUR),
-        tableData: [],
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        screenHeight: document.documentElement.clientHeight - 330,//屏幕高度,
-        environmentId: undefined,
-        selectAll: false,
-        unSelection:[],
-        selectDataCounts:0,
-      }
+    isCaseRelevance: {
+      type: Boolean,
+      default: false,
     },
-    props: {
-      currentProtocol: String,
-      selectNodeIds: Array,
-      visible: {
-        type: Boolean,
-        default: false,
-      },
-      isCaseRelevance: {
-        type: Boolean,
-        default: false,
-      },
-      trashEnable: {
-        type: Boolean,
-        default: false,
-      },
-      isApiListEnable: Boolean,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
+    trashEnable: {
+      type: Boolean,
+      default: false,
     },
-    created: function () {
+    isApiListEnable: Boolean,
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+  },
+  mounted: function () {
+    this.initTable();
+  },
+  created: function () {
+    this.initTable();
+    this.getMaintainerOptions();
+  },
+  watch: {
+    selectNodeIds() {
       this.initTable();
-      this.getMaintainerOptions();
     },
-    watch: {
-      selectNodeIds() {
+    currentProtocol() {
+      this.initTable();
+    },
+    trashEnable() {
+      if (this.trashEnable) {
         this.initTable();
-      },
-      currentProtocol() {
-        this.initTable();
-      },
-      trashEnable() {
-        if (this.trashEnable) {
-          this.initTable();
-        }
+      }
+    }
+  },
+  methods: {
+    isApiListEnableChange(data) {
+      this.$emit('isApiListEnableChange', data);
+    },
+    initTable() {
+      this.selectRows = new Set();
+
+      this.selectAll = false;
+      this.unSelection = [];
+      this.selectDataCounts = 0;
+
+      this.condition.filters = ["Prepare", "Underway", "Completed"];
+
+      this.condition.moduleIds = this.selectNodeIds;
+      if (this.trashEnable) {
+        this.condition.filters = ["Trash"];
+        this.condition.moduleIds = [];
+      }
+
+      this.condition.projectId = getCurrentProjectID();
+      if (this.currentProtocol != null) {
+        this.condition.protocol = this.currentProtocol;
+      }
+
+      //检查是否只查询本周数据
+      this.getSelectDataRange();
+      this.condition.selectThisWeedData = false;
+      this.condition.apiCaseCoverage = null;
+      switch (this.selectDataRange){
+        case 'thisWeekCount':
+          this.condition.selectThisWeedData = true;
+          break;
+        case 'Prepare':
+          this.condition.filters = [this.selectDataRange];
+          break;
+        case 'Completed':
+          this.condition.filters = [this.selectDataRange];
+          break;
+        case 'Underway':
+          this.condition.filters = [this.selectDataRange];
+          break;
+        case 'uncoverage':
+          this.condition.apiCaseCoverage = 'uncoverage';
+          break;
+        case 'coverage':
+          this.condition.apiCaseCoverage = 'coverage';
+          break;
+      }
+      if (this.condition.projectId) {
+        this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+          this.unSelection = response.data.listObject.map(s => s.id);
+        });
       }
     },
-    methods: {
-      isApiListEnableChange(data) {
-        this.$emit('isApiListEnableChange', data);
-      },
-      initTable() {
-        this.selectRows = new Set();
-
-        this.selectAll  = false;
-        this.unSelection = [];
-        this.selectDataCounts = 0;
-
-        this.condition.filters = ["Prepare", "Underway", "Completed"];
-
-        this.condition.moduleIds = this.selectNodeIds;
-        if (this.trashEnable) {
-          this.condition.filters = ["Trash"];
-          this.condition.moduleIds = [];
-        }
-
-        this.condition.projectId = getCurrentProjectID();
-        if (this.currentProtocol != null) {
-          this.condition.protocol = this.currentProtocol;
-        }
-        if (this.condition.projectId) {
-          this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
-            this.total = response.data.itemCount;
-            this.tableData = response.data.listObject;
-            this.unSelection = response.data.listObject.map(s=>s.id);
-          });
-        }
-      },
-      getMaintainerOptions() {
-        let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-          this.valueArr.userId = response.data;
-        });
-      },
-      handleSelect(selection, row) {
-        row.hashTree = [];
-        if (this.selectRows.has(row)) {
-          this.$set(row, "showMore", false);
-          this.selectRows.delete(row);
-        } else {
+    getMaintainerOptions() {
+      let workspaceId = localStorage.getItem(WORKSPACE_ID);
+      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.valueArr.userId = response.data;
+      });
+    },
+    handleSelect(selection, row) {
+      row.hashTree = [];
+      if (this.selectRows.has(row)) {
+        this.$set(row, "showMore", false);
+        this.selectRows.delete(row);
+      } else {
+        this.$set(row, "showMore", true);
+        this.selectRows.add(row);
+      }
+      let arr = Array.from(this.selectRows);
+      // 选中1个以上的用例时显示更多操作
+      if (this.selectRows.size === 1) {
+        this.$set(arr[0], "showMore", true);
+      } else if (this.selectRows.size === 2) {
+        arr.forEach(row => {
           this.$set(row, "showMore", true);
-          this.selectRows.add(row);
-        }
-        let arr = Array.from(this.selectRows);
-        // 选中1个以上的用例时显示更多操作
-        if (this.selectRows.size === 1) {
-          this.$set(arr[0], "showMore", true);
-        } else if (this.selectRows.size === 2) {
-          arr.forEach(row => {
-            this.$set(row, "showMore", true);
-          })
-        }
-        this.selectRowsCount(this.selectRows)
-      },
-      handleSelectAll(selection) {
-        if (selection.length > 0) {
-          if (selection.length === 1) {
-            selection.hashTree = [];
-            this.selectRows.add(selection[0]);
-          } else {
-            this.tableData.forEach(item => {
-              item.hashTree = [];
-              this.$set(item, "showMore", true);
-              this.selectRows.add(item);
-            });
-          }
+        })
+      }
+      this.selectRowsCount(this.selectRows)
+    },
+    handleSelectAll(selection) {
+      if (selection.length > 0) {
+        if (selection.length === 1) {
+          selection.hashTree = [];
+          this.selectRows.add(selection[0]);
         } else {
-          this.selectRows.clear();
-          this.tableData.forEach(row => {
-            this.$set(row, "showMore", false);
-          })
-        }
-        this.selectRowsCount(this.selectRows)
-      },
-      search() {
-        this.initTable();
-      },
-      buildPagePath(path) {
-        return path + "/" + this.currentPage + "/" + this.pageSize;
-      },
-
-      editApi(row) {
-        this.$emit('editApi', row);
-      },
-      reductionApi(row) {
-        row.request = null;
-        row.response = null;
-        let rows = [row];
-        this.$post('/api/definition/reduction/', rows, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.search();
-        });
-      },
-      handleDeleteBatch() {
-        if (this.trashEnable) {
-          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-            confirmButtonText: this.$t('commons.confirm'),
-            callback: (action) => {
-              if (action === 'confirm') {
-                let deleteParam = {};
-                let ids = Array.from(this.selectRows).map(row => row.id);
-                deleteParam.dataIds = ids;
-                deleteParam.projectId = getCurrentProjectID();
-                deleteParam.selectAllDate = this.isSelectAllDate;
-                deleteParam.unSelectIds = this.unSelection;
-                deleteParam = Object.assign(deleteParam, this.condition);
-                this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
-                  this.selectRows.clear();
-                  this.initTable();
-                  this.$success(this.$t('commons.delete_success'));
-                });
-              }
-            }
-          });
-        } else {
-          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-            confirmButtonText: this.$t('commons.confirm'),
-            callback: (action) => {
-              if (action === 'confirm') {
-                let ids = Array.from(this.selectRows).map(row => row.id);
-                let deleteParam = {};
-                deleteParam.dataIds = ids;
-                deleteParam.projectId = getCurrentProjectID();
-                deleteParam.selectAllDate = this.isSelectAllDate;
-                deleteParam.unSelectIds = this.unSelection;
-                deleteParam = Object.assign(deleteParam, this.condition);
-                this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
-                  this.selectRows.clear();
-                  this.initTable();
-                  this.$success(this.$t('commons.delete_success'));
-                  this.$refs.caseList.apiCaseClose();
-                });
-              }
-            }
+          this.tableData.forEach(item => {
+            item.hashTree = [];
+            this.$set(item, "showMore", true);
+            this.selectRows.add(item);
           });
         }
-      },
-      handleEditBatch() {
-        this.$refs.batchEdit.open();
-      },
-      batchEdit(form) {
-        let arr = Array.from(this.selectRows);
-        let ids = arr.map(row => row.id);
-        let param = {};
-        param[form.type] = form.value;
-        param.ids = ids;
+      } else {
+        this.selectRows.clear();
+        this.tableData.forEach(row => {
+          this.$set(row, "showMore", false);
+        })
+      }
+      this.selectRowsCount(this.selectRows)
+    },
+    search() {
+      this.changeSelectDataRangeAll();
+      this.initTable();
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
 
-        param.projectId = getCurrentProjectID();
-        param.selectAllDate = this.isSelectAllDate;
-        param.unSelectIds = this.unSelection;
-        param = Object.assign(param, this.condition);
-
-        this.$post('/api/definition/batch/editByParams', param, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.initTable();
-        });
-      },
-      handleTestCase(api) {
-        this.selectApi = api;
-        let request = {};
-        if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-          request = api.request;
-        } else {
-          request = JSON.parse(api.request);
-        }
-        if (!request.hashTree) {
-          request.hashTree = [];
-        }
-        this.selectApi.url = request.path;
-        this.$refs.caseList.open(this.selectApi);
-      },
-      handleDelete(api) {
-        if (this.trashEnable) {
-          this.$get('/api/definition/delete/' + api.id, () => {
-            this.$success(this.$t('commons.delete_success'));
-            this.initTable();
-          });
-          return;
-        }
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
+    editApi(row) {
+      this.$emit('editApi', row);
+    },
+    reductionApi(row) {
+      row.request = null;
+      row.response = null;
+      let rows = [row];
+      this.$post('/api/definition/reduction/', rows, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.search();
+      });
+    },
+    handleDeleteBatch() {
+      if (this.trashEnable) {
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              let ids = [api.id];
-              this.$post('/api/definition/removeToGc/', ids, () => {
-                this.$success(this.$t('commons.delete_success'));
+              let deleteParam = {};
+              let ids = Array.from(this.selectRows).map(row => row.id);
+              deleteParam.dataIds = ids;
+              deleteParam.projectId = getCurrentProjectID();
+              deleteParam.selectAllDate = this.isSelectAllDate;
+              deleteParam.unSelectIds = this.unSelection;
+              deleteParam = Object.assign(deleteParam, this.condition);
+              this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
+                this.selectRows.clear();
                 this.initTable();
+                this.$success(this.$t('commons.delete_success'));
+              });
+            }
+          }
+        });
+      } else {
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              let ids = Array.from(this.selectRows).map(row => row.id);
+              let deleteParam = {};
+              deleteParam.dataIds = ids;
+              deleteParam.projectId = getCurrentProjectID();
+              deleteParam.selectAllDate = this.isSelectAllDate;
+              deleteParam.unSelectIds = this.unSelection;
+              deleteParam = Object.assign(deleteParam, this.condition);
+              this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$success(this.$t('commons.delete_success'));
                 this.$refs.caseList.apiCaseClose();
               });
             }
           }
         });
-      },
-      getColor(enable, method) {
-        if (enable) {
-          return this.methodColorMap.get(method);
-        }
-      },
-      showExecResult(row) {
-        this.$emit('showExecResult', row);
-      },
-      selectRowsCount(selection){
-        let selectedIDs = this.getIds(selection);
-        let allIDs = this.tableData.map(s=>s.id);
-        this.unSelection = allIDs.filter(function (val) {
-          return selectedIDs.indexOf(val) === -1
-        });
-        if(this.isSelectAllDate){
-          this.selectDataCounts =this.total - this.unSelection.length;
-        }else {
-          this.selectDataCounts =selection.size;
-        }
-      },
-      isSelectDataAll(dataType) {
-        this.isSelectAllDate = dataType;
-        this.selectRowsCount(this.selectRows)
-        //如果已经全选，不需要再操作了
-        if (this.selectRows.size != this.tableData.length) {
-          this.$refs.apiDefinitionTable.toggleAllSelection(true);
-        }
-      },
-      getIds(rowSets){
-        let rowArray = Array.from(rowSets)
-        let ids =  rowArray.map(s=>s.id);
-        return ids;
       }
     },
-  }
+    handleEditBatch() {
+      this.$refs.batchEdit.open();
+    },
+    batchEdit(form) {
+      let arr = Array.from(this.selectRows);
+      let ids = arr.map(row => row.id);
+      let param = {};
+      param[form.type] = form.value;
+      param.ids = ids;
+
+      param.projectId = getCurrentProjectID();
+      param.selectAllDate = this.isSelectAllDate;
+      param.unSelectIds = this.unSelection;
+      param = Object.assign(param, this.condition);
+
+      this.$post('/api/definition/batch/editByParams', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.initTable();
+      });
+    },
+    handleTestCase(api) {
+      this.selectApi = api;
+      let request = {};
+      if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+        request = api.request;
+      } else {
+        request = JSON.parse(api.request);
+      }
+      if (!request.hashTree) {
+        request.hashTree = [];
+      }
+      this.selectApi.url = request.path;
+      this.$refs.caseList.open(this.selectApi);
+    },
+    handleDelete(api) {
+      if (this.trashEnable) {
+        this.$get('/api/definition/delete/' + api.id, () => {
+          this.$success(this.$t('commons.delete_success'));
+          this.initTable();
+        });
+        return;
+      }
+      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            let ids = [api.id];
+            this.$post('/api/definition/removeToGc/', ids, () => {
+              this.$success(this.$t('commons.delete_success'));
+              this.initTable();
+              this.$refs.caseList.apiCaseClose();
+            });
+          }
+        }
+      });
+    },
+    getColor(enable, method) {
+      if (enable) {
+        return this.methodColorMap.get(method);
+      }
+    },
+    showExecResult(row) {
+      this.$emit('showExecResult', row);
+    },
+    selectRowsCount(selection) {
+      let selectedIDs = this.getIds(selection);
+      let allIDs = this.tableData.map(s => s.id);
+      this.unSelection = allIDs.filter(function (val) {
+        return selectedIDs.indexOf(val) === -1
+      });
+      if (this.isSelectAllDate) {
+        this.selectDataCounts = this.total - this.unSelection.length;
+      } else {
+        this.selectDataCounts = selection.size;
+      }
+    },
+    isSelectDataAll(dataType) {
+      this.isSelectAllDate = dataType;
+      this.selectRowsCount(this.selectRows)
+      //如果已经全选，不需要再操作了
+      if (this.selectRows.size != this.tableData.length) {
+        this.$refs.apiDefinitionTable.toggleAllSelection(true);
+      }
+    },
+    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+    getSelectDataRange() {
+      let dataRange = this.$route.params.dataSelectRange;
+      let dataType = this.$route.params.dataType;
+      if (dataType === 'api') {
+        this.selectDataRange = dataRange;
+      } else {
+        this.selectDataRange = 'all';
+      }
+    },
+    changeSelectDataRangeAll() {
+      this.$emit("changeSelectDataRangeAll", "api");
+    },
+    getIds(rowSets) {
+      let rowArray = Array.from(rowSets)
+      let ids = rowArray.map(s => s.id);
+      return ids;
+    }
+  },
+}
 </script>
 
 <style scoped>
-  .operate-button > div {
-    display: inline-block;
-    margin-left: 10px;
-  }
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
 
-  .request-method {
-    padding: 0 5px;
-    color: #1E90FF;
-  }
+.request-method {
+  padding: 0 5px;
+  color: #1E90FF;
+}
 
-  .api-el-tag {
-    color: white;
-  }
+.api-el-tag {
+  color: white;
+}
 
-  .search-input {
-    float: right;
-    width: 300px;
-    /*margin-bottom: 20px;*/
-    margin-right: 20px;
-  }
+.search-input {
+  float: right;
+  width: 300px;
+  /*margin-bottom: 20px;*/
+  margin-right: 20px;
+}
 
-  .api-list >>> th:first-child {
-    /*border: 1px solid #DCDFE6;*/
-    /*border-right: 0px;*/
-    /*border-top-left-radius:5px;*/
-    /*border-bottom-left-radius:5px;*/
-    /*width: 20px;*/
+.api-list >>> th:first-child {
+  /*border: 1px solid #DCDFE6;*/
+  /*border-right: 0px;*/
+  /*border-top-left-radius:5px;*/
+  /*border-bottom-left-radius:5px;*/
+  /*width: 20px;*/
 
-  }
+}
 
-  .api-list >>> th:nth-child(2) {
-    /*border: 1px solid #DCDFE6;*/
-    /*border-left: 0px;*/
-    /*border-top-right-radius:5px;*/
-    /*border-bottom-right-radius:5px;*/
-  }
+.api-list >>> th:nth-child(2) {
+  /*border: 1px solid #DCDFE6;*/
+  /*border-left: 0px;*/
+  /*border-top-right-radius:5px;*/
+  /*border-bottom-right-radius:5px;*/
+}
 
-  .api-list >>> th:first-child>.cell {
-    padding: 5px;
-    width: 30px;
-  }
-  .api-list >>> th:nth-child(2)>.cell {
-    /*background-color: black;*/
-  }
+.api-list >>> th:first-child > .cell {
+  padding: 5px;
+  width: 30px;
+}
 
-  .api-list >>> .el-dropdown {
-    float: left;
-  }
+.api-list >>> th:nth-child(2) > .cell {
+  /*background-color: black;*/
+}
+
+.api-list >>> .el-dropdown {
+  float: left;
+}
 
 </style>
diff --git a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue b/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
index 922b7948c4..18a3829919 100644
--- a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
+++ b/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
@@ -28,13 +28,13 @@
       <el-row :gutter="0"></el-row>
       <el-row :gutter="10">
         <el-col :span="6">
-          <ms-api-info-card :api-count-data="apiCountData"/>
+          <ms-api-info-card @redirectPage="redirectPage" :api-count-data="apiCountData"/>
         </el-col>
         <el-col :span="6">
-          <ms-test-case-info-card :test-case-count-data="testCaseCountData"/>
+          <ms-test-case-info-card @redirectPage="redirectPage" :test-case-count-data="testCaseCountData"/>
         </el-col>
         <el-col :span="6">
-          <ms-scene-info-card :scene-count-data="sceneCountData"/>
+          <ms-scene-info-card @redirectPage="redirectPage"  :scene-count-data="sceneCountData"/>
         </el-col>
         <el-col :span="6">
           <ms-schedule-task-info-card :schedule-task-count-data="scheduleTaskCountData"/>
@@ -43,10 +43,10 @@
 
       <el-row :gutter="10">
         <el-col :span="12">
-          <ms-failure-test-case-list/>
+          <ms-failure-test-case-list @redirectPage="redirectPage"/>
         </el-col>
         <el-col :span="12">
-          <ms-running-task-list/>
+          <ms-running-task-list @redirectPage="redirectPage"/>
         </el-col>
       </el-row>
 
@@ -64,7 +64,7 @@ import MsTestCaseInfoCard from "./components/TestCaseInfoCard";
 
 import MsFailureTestCaseList from "./components/FailureTestCaseList";
 import MsRunningTaskList from "./components/RunningTaskList"
-import {getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID,getUUID} from "@/common/js/utils";
 
 export default {
   name: "ApiTestHomePage",
@@ -117,6 +117,22 @@ export default {
         this.scheduleTaskCountData = response.data;
       });
     },
+    redirectPage(page,dataType,selectType){
+      //api页面跳转
+      //传入UUID是为了进行页面重新加载判断
+      let uuid = getUUID();
+      switch (page){
+        case "api":
+          this.$router.push({name:'ApiDefinition',params:{redirectID:uuid,dataType:dataType,dataSelectRange:selectType}});
+          break;
+        case "scenario":
+          this.$router.push({name:'ApiAutomation',params:{redirectID:uuid,dataType:dataType,dataSelectRange:selectType}});
+          break;
+        case "testPlanEdit":
+          this.$router.push('/track/plan/view/'+selectType)
+          break;
+      }
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/homepage/components/ApiInfoCard.vue b/frontend/src/business/components/api/homepage/components/ApiInfoCard.vue
index 1c9eabb172..5785c09907 100644
--- a/frontend/src/business/components/api/homepage/components/ApiInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/ApiInfoCard.vue
@@ -54,7 +54,10 @@
       <el-header style="height:20px;padding: 0px;margin-bottom: 10px;">
         <el-row>
           <el-col>
-            {{$t('api_test.home_page.api_details_card.this_week_add',[apiCountData.thisWeekAddedCount])}}
+            {{$t('api_test.home_page.api_details_card.this_week_add')}}
+            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{apiCountData.thisWeekAddedCount}}
+            </el-link>
+            {{$t('api_test.home_page.unit_of_measurement')}}
           </el-col>
         </el-row>
       </el-header>
@@ -80,21 +83,27 @@
                     <span class="default-property">
                       {{$t('api_test.home_page.detail_card.running')}}
                       {{"\xa0\xa0"}}
-                      {{apiCountData.runningCount}}
+                      <el-link type="info" @click="redirectPage('Underway')" target="_blank" style="color: #000000">
+                        {{apiCountData.runningCount}}
+                      </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="default-property">
                       {{$t('api_test.home_page.detail_card.not_started')}}
                       {{"\xa0\xa0"}}
-                      {{apiCountData.notStartedCount}}
+                      <el-link type="info" @click="redirectPage('Prepare')" target="_blank" style="color: #000000">
+                        {{apiCountData.notStartedCount}}
+                      </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="main-property">
                       {{$t('api_test.home_page.detail_card.finished')}}
                       {{"\xa0\xa0"}}
-                      {{apiCountData.finishedCount}}
+                      <el-link type="info" @click="redirectPage('Completed')" target="_blank" style="color: #000000">
+                        {{apiCountData.finishedCount}}
+                      </el-link>
                     </span>
                   </el-col>
                 </el-row>
@@ -123,6 +132,11 @@ export default {
   props:{
     apiCountData:{},
   },
+  methods:{
+    redirectPage(clickType){
+      this.$emit("redirectPage","api","api",clickType);
+    }
+  }
 }
 </script>
 <style scoped>
diff --git a/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue b/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
index 1e7235817b..d54ca2682d 100644
--- a/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
+++ b/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
@@ -7,7 +7,13 @@
     </template>
     <el-table border :data="tableData" class="adjust-table table-content" height="300px">
       <el-table-column prop="sortIndex"  :label="$t('api_test.home_page.failed_case_list.table_coloum.index')" width="100" show-overflow-tooltip/>
-      <el-table-column prop="caseName"  :label="$t('api_test.home_page.failed_case_list.table_coloum.case_name')" width="150" show-overflow-tooltip/>
+      <el-table-column prop="caseName"  :label="$t('api_test.home_page.failed_case_list.table_coloum.case_name')" width="150">
+        <template v-slot:default="{row}">
+            <el-link type="info" @click="redirect(row.caseType,row.caseID)">
+              {{ row.caseName }}
+            </el-link>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="caseType"
         column-key="caseType"
@@ -19,7 +25,15 @@
           <ms-tag v-if="scope.row.caseType == 'scenario'" type="warning" effect="plain" :content="$t('api_test.home_page.failed_case_list.table_value.case_type.scene')"/>
         </template>
       </el-table-column>
-      <el-table-column prop="testPlan"  :label="$t('api_test.home_page.failed_case_list.table_coloum.test_plan')" show-overflow-tooltip/>
+      <el-table-column prop="testPlan"  :label="$t('api_test.home_page.failed_case_list.table_coloum.test_plan')">
+        <template v-slot:default="{row}">
+          <div v-for="testPlan in row.testPlanDTOList" :key="testPlan.id">
+            <el-link type="info" @click="redirect('testPlanEdit',testPlan.id)">
+              {{ testPlan.name }};
+            </el-link>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="failureTimes"  :label="$t('api_test.home_page.failed_case_list.table_coloum.failure_times')" width="100" show-overflow-tooltip/>
     </el-table>
   </el-card>
@@ -51,6 +65,19 @@ export default {
         this.tableData = response.data;
       });
     },
+    redirect(pageType,param){
+      switch (pageType){
+        case "testPlanEdit":
+          this.$emit('redirectPage','testPlanEdit',null, param);
+          break;
+        case "apiCase":
+          this.$emit('redirectPage','api','apiTestCase', 'single:'+param);
+          break;
+        case "scenario":
+          this.$emit('redirectPage','scenario','scenario', 'edit:'+param);
+          break;
+      }
+    }
   },
 
 
diff --git a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
index 66dc7a7888..ec1453ed58 100644
--- a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
+++ b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
@@ -7,7 +7,13 @@
     </template>
     <el-table border :data="tableData" class="adjust-table table-content" height="300px">
       <el-table-column prop="index"  :label="$t('api_test.home_page.running_task_list.table_coloum.index')" width="80" show-overflow-tooltip/>
-      <el-table-column prop="scenario"  :label="$t('api_test.home_page.running_task_list.table_coloum.scenario')" width="200" show-overflow-tooltip/>
+      <el-table-column prop="scenario"  :label="$t('api_test.home_page.running_task_list.table_coloum.scenario')" width="200" >
+        <template v-slot:default="{row}">
+          <el-link type="info" @click="redirect(row.scenarioId)">
+            {{ row.scenario }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column prop="rule"  :label="$t('api_test.home_page.running_task_list.table_coloum.run_rule')" width="120" show-overflow-tooltip/>
       <el-table-column width="100" :label="$t('api_test.home_page.running_task_list.table_coloum.task_status')">
         <template v-slot:default="scope">
@@ -80,6 +86,9 @@ export default {
       this.result = this.$post('/api/schedule/updateEnableByPrimyKey', taskRow, response => {
         this.search();
       });
+    },
+    redirect(param){
+      this.$emit('redirectPage','scenario','scenario', 'edit:'+param);
     }
   },
 
diff --git a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
index 1683a9121c..0f5a5db41f 100644
--- a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
@@ -21,7 +21,10 @@
       <el-header style="height:20px;padding: 0px;margin-bottom: 10px;">
       <el-row :gutter="20" class="hidden-lg-and-down ">
         <el-col  :span="8">
-          {{$t('api_test.home_page.test_scene_details_card.this_week_add',[sceneCountData.thisWeekAddedCount])}}
+          {{$t('api_test.home_page.test_scene_details_card.this_week_add')}}
+          <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{sceneCountData.thisWeekAddedCount}}
+          </el-link>
+          {{$t('api_test.home_page.unit_of_measurement')}}
         </el-col>
         <el-col :span="8" >
           {{$t('api_test.home_page.test_scene_details_card.this_week_execute',[sceneCountData.thisWeekExecutedCount])}}
@@ -32,7 +35,11 @@
       </el-row>
       <el-row :gutter="20" class="hidden-xl-only">
         <el-col  :span="8">
-          <div class="count-info-div" v-html="$t('api_test.home_page.test_scene_details_card.this_week_add_sm',[sceneCountData.thisWeekAddedCount])"></div>
+          {{$t('api_test.home_page.test_scene_details_card.this_week_add_sm')}}
+          <br/>
+          <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{sceneCountData.thisWeekAddedCount}}
+          </el-link>
+          {{$t('api_test.home_page.unit_of_measurement')}}
         </el-col>
         <el-col :span="8" >
           <div class="count-info-div" v-html="$t('api_test.home_page.test_scene_details_card.this_week_execute_sm',[sceneCountData.thisWeekExecutedCount])"></div>
@@ -64,21 +71,27 @@
                     <span class="defaultProperty">
                       {{$t('api_test.home_page.detail_card.unexecute')}}
                       {{"\xa0\xa0"}}
-                      {{sceneCountData.unexecuteCount}}
+                      <el-link type="info" @click="redirectPage('unExecute')" target="_blank" style="color: #000000">
+                        {{sceneCountData.unexecuteCount}}
+                      </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="defaultProperty">
                       {{$t('api_test.home_page.detail_card.execution_failed')}}
                       {{"\xa0\xa0"}}
-                      {{sceneCountData.executionFailedCount}}
+                      <el-link type="info" @click="redirectPage('executeFailed')" target="_blank" style="color: #000000">
+                        {{sceneCountData.executionFailedCount}}
+                      </el-link>
                     </span>
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="main-property">
                       {{$t('api_test.home_page.detail_card.execution_pass')}}
                       {{"\xa0\xa0"}}
-                      {{sceneCountData.executionPassCount}}
+                      <el-link type="info" @click="redirectPage('executePass')" target="_blank" style="color: #000000">
+                        {{sceneCountData.executionPassCount}}
+                      </el-link>
                     </span>
                   </el-col>
                 </el-row>
@@ -110,6 +123,9 @@ export default {
   },
 
   methods: {
+    redirectPage(clickType){
+      this.$emit("redirectPage","scenario","scenario",clickType);
+    }
   },
 }
 </script>
diff --git a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
index 2b77654801..51c80c0f69 100644
--- a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
@@ -53,7 +53,10 @@
       <el-header style="height:20px;padding: 0px;margin-bottom: 10px;">
         <el-row :gutter="20" class="hidden-lg-and-down ">
           <el-col  :span="8">
-            {{$t('api_test.home_page.test_case_details_card.this_week_add',[testCaseCountData.thisWeekAddedCount])}}
+            {{$t('api_test.home_page.test_case_details_card.this_week_add')}}
+            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{testCaseCountData.thisWeekAddedCount}}
+            </el-link>
+            {{$t('api_test.home_page.unit_of_measurement')}}
           </el-col>
           <el-col :span="8" >
             {{$t('api_test.home_page.test_case_details_card.this_week_execute',[testCaseCountData.thisWeekExecutedCount])}}
@@ -64,7 +67,11 @@
         </el-row>
         <el-row :gutter="20" class="hidden-xl-only">
           <el-col  :span="8">
-            <div class="count-info-div" v-html="$t('api_test.home_page.test_case_details_card.this_week_add_sm',[testCaseCountData.thisWeekAddedCount])"></div>
+            {{$t('api_test.home_page.test_case_details_card.this_week_add_sm')}}
+            <br/>
+            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{testCaseCountData.thisWeekAddedCount}}
+            </el-link>
+            {{$t('api_test.home_page.unit_of_measurement')}}
           </el-col>
           <el-col :span="8" >
             <div class="count-info-div" v-html="$t('api_test.home_page.test_case_details_card.this_week_execute_sm',[testCaseCountData.thisWeekExecutedCount])"></div>
@@ -96,7 +103,9 @@
                     <span class="default-property">
                       {{$t('api_test.home_page.detail_card.uncoverage')}}
                       {{"\xa0\xa0"}}
-                      {{testCaseCountData.uncoverageCount}}
+                      <el-link type="info" @click="redirectPage('uncoverage')" target="_blank" style="color: #000000">
+                        {{testCaseCountData.uncoverageCount}}
+                      </el-link>
                     </span>
                   </el-col>
                   <el-col style=" height: 20px;margin-top: 3px;">
@@ -105,7 +114,9 @@
                     <span class="main-property">
                       {{$t('api_test.home_page.detail_card.coverage')}}
                       {{"\xa0\xa0"}}
-                      {{testCaseCountData.coverageCount}}
+                      <el-link type="info" @click="redirectPage('coverage')" target="_blank" style="color: #000000">
+                        {{testCaseCountData.coverageCount}}
+                      </el-link>
                     </span>
                   </el-col>
                 </el-row>
@@ -135,6 +146,16 @@ export default {
     testCaseCountData:{},
   },
   methods: {
+    redirectPage(clickType){
+      if(clickType === 'thisWeekCount'){
+        //这里业务逻辑应当跳转接口案例列表
+        this.$emit("redirectPage","api","apiTestCase",clickType);
+      }else{
+        //这里业务逻辑应当跳转接口列表
+        this.$emit("redirectPage","api","api",clickType);
+      }
+
+    }
   },
 
   created() {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a8cc15c2b2..fc612d9401 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -808,6 +808,8 @@ export default {
     },
     home_page: {
       unit_of_measurement: "",
+      unit_of_count: "",
+      unit_of_times: "times",
       api_count_card: {
         title: "API count",
       },
@@ -840,23 +842,23 @@ export default {
       },
       api_details_card: {
         title: "API",
-        this_week_add: "Added {0} this week",
+        this_week_add: "This week add:",
       },
       test_case_details_card: {
         title: "Test case",
-        this_week_add: "Added {0} this week",
+        this_week_add: "This week add:",
         this_week_execute: "Executed {0} this week",
         executed: "Executed {0} in history",
-        this_week_add_sm: "Added {0}<br/> this week",
+        this_week_add_sm: "This week add:",
         this_week_execute_sm: "Executed {0}<br/> this week",
         executed_sm: "Executed {0}<br/> in history",
       },
       test_scene_details_card: {
         title: "Scene",
-        this_week_add: "Added {0} this week",
+        this_week_add: "This week add:",
         this_week_execute: "Executed {0} this week",
         executed: "Executed {0} in history",
-        this_week_add_sm: "Added {0}<br/> this week",
+        this_week_add_sm: "This week add:",
         this_week_execute_sm: "Executed {0}<br/> this week",
         executed_sm: "Executed {0}<br/> in history",
       },
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c172f30d2d..51ff0880ab 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -809,6 +809,8 @@ export default {
     },
     home_page: {
       unit_of_measurement: "个",
+      unit_of_count: "个",
+      unit_of_times: "次",
       api_count_card: {
         title: "接口数量统计",
       },
@@ -841,23 +843,23 @@ export default {
       },
       api_details_card: {
         title: "接口",
-        this_week_add: "本周新增: {0}个",
+        this_week_add: "本周新增:",
       },
       test_case_details_card: {
         title: "用例",
-        this_week_add: "本周新增: {0}个",
+        this_week_add: "本周新增:",
         this_week_execute: "本周执行: {0}次",
         executed: "历史总执行: {0}次",
-        this_week_add_sm: "本周新增:<br/>{0}个",
+        this_week_add_sm: "本周新增:",
         this_week_execute_sm: "本周执行:<br/>{0}次",
         executed_sm: "历史总执行:<br/>{0}次",
       },
       test_scene_details_card: {
         title: "场景",
-        this_week_add: "本周新增: {0}个",
+        this_week_add: "本周新增:",
         this_week_execute: "本周执行: {0}次",
         executed: "历史总执行: {0}次",
-        this_week_add_sm: "本周新增:<br/>{0}个",
+        this_week_add_sm: "本周新增:",
         this_week_execute_sm: "本周执行:<br/>{0}次",
         executed_sm: "历史总执行:<br/>{0}次",
       },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index b3a6f156bc..00fb92be54 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -808,6 +808,8 @@ export default {
     },
     home_page: {
       unit_of_measurement: "個",
+      unit_of_count: "個",
+      unit_of_times: "次",
       api_count_card: {
         title: "接口數量統計",
       },
@@ -840,23 +842,23 @@ export default {
       },
       api_details_card: {
         title: "接口",
-        this_week_add: "本週新增: {0}个",
+        this_week_add: "本週新增:",
       },
       test_case_details_card: {
         title: "用例",
-        this_week_add: "本週新增: {0}个",
+        this_week_add: "本週新增:",
         this_week_execute: "本週執行: {0}次",
         executed: "歷史總執行: {0}次",
-        this_week_add_sm: "本週新增:<br/>{0}个",
+        this_week_add_sm: "本週新增:",
         this_week_execute_sm: "本週執行:<br/>{0}次",
         executed_sm: "歷史總執行:<br/>{0}次",
       },
       test_scene_details_card: {
         title: "場景",
-        this_week_add: "本週新增: {0}个",
+        this_week_add: "本週新增:",
         this_week_execute: "本週執行: {0}次",
         executed: "歷史總執行: {0}次",
-        this_week_add_sm: "本週新增:<br/>{0}个",
+        this_week_add_sm: "本週新增:",
         this_week_execute_sm: "本週執行:<br/>{0}次",
         executed_sm: "歷史總執行:<br/>{0}次",
       },

From b402acfeda17ee412092515715eb36714bd48711 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 5 Jan 2021 18:20:51 +0800
Subject: [PATCH 12/14] =?UTF-8?q?fix:=20=E5=9C=BA=E6=99=AF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复场景跳转数据查询功能失效的问题
---
 .../java/io/metersphere/api/controller/APITestController.java   | 2 ++
 .../components/api/automation/scenario/ApiScenarioList.vue      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 9d461bb032..78bd6367af 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -341,8 +341,10 @@ public class APITestController {
     public List<TaskInfoResult> runningTask(@PathVariable String projectID) {
 
         List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID);
+        int dataIndex = 1;
         for (TaskInfoResult taskInfo :
                 resultList) {
+            taskInfo.setIndex(dataIndex++);
             Date nextExecutionTime = CronUtils.getNextTriggerTime(taskInfo.getRule());
             if(nextExecutionTime!=null){
                 taskInfo.setNextExecutionTime(nextExecutionTime.getTime());
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index af60326fd4..92e71d8b20 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -215,7 +215,7 @@ export default {
       this.condition.executeStatus = null;
       this.isSelectThissWeekData();
       switch (this.selectDataRange){
-        case 'thisWeek':
+        case 'thisWeekCount':
           this.condition.selectThisWeedData = true;
           break;
         case 'unExecute':

From d89de179b366bb7459a25b3d4188b31c550243fd Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 6 Jan 2021 10:03:07 +0800
Subject: [PATCH 13/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E6=97=B6=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A7=A3=E6=9E=90=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/performance/service/JmeterFileService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
index 29dad1b809..65f0396d00 100644
--- a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
@@ -88,7 +88,7 @@ public class JmeterFileService {
         if (!CollectionUtils.isEmpty(testData)) {
             for (String k : testData.keySet()) {
                 String v = testData.get(k);
-                files.put("k", v.getBytes(StandardCharsets.UTF_8));
+                files.put(k, v.getBytes(StandardCharsets.UTF_8));
             }
         }
 
@@ -97,7 +97,7 @@ public class JmeterFileService {
         if (!CollectionUtils.isEmpty(jarFiles)) {
             for (String k : jarFiles.keySet()) {
                 byte[] v = jarFiles.get(k);
-                files.put("k", v);
+                files.put(k, v);
             }
         }
 

From 9b22917e8c0491aca2cec2888a68633547b92d25 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 6 Jan 2021 10:17:55 +0800
Subject: [PATCH 14/14] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=9C=BA=E6=99=AF=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=A5=97=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复首页跳转场景修改页面控制套报错的问题
---
 .../business/components/api/automation/ApiAutomation.vue   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index fcc2f45bea..fe9227773c 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -87,7 +87,7 @@ export default {
       isHide: true,
       activeName: 'default',
       currentModule: null,
-      moduleOptions: {},
+      moduleOptions: [],
       tabs: [],
       trashEnable: false,
       selectNodeIds: [],
@@ -114,7 +114,12 @@ export default {
           this.$post(url, {id:scenarioId,projectId:projectId}, response => {
             let data = response.data;
             if(data!=null){
+              //如果树未加载
+              if(JSON.stringify(this.moduleOptions) === '{}' ){
+                this.$refs.nodeTree.list();
+              }
               let row = data.listObject[0];
+              row.tags = JSON.parse(row.tags);
               this.editScenario(row);
             }
           });