From 8b9b259853c63956bbda3f177533cf401af0693d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 15 Mar 2021 16:01:09 +0800
Subject: [PATCH 01/18] =?UTF-8?q?feat(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?):=20=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ceTestReport.vue => PerformanceTestReportList.vue} | 11 ++++++++---
 .../src/business/components/performance/router.js     |  4 ++--
 frontend/src/i18n/en-US.js                            |  3 +++
 frontend/src/i18n/zh-CN.js                            |  3 +++
 frontend/src/i18n/zh-TW.js                            |  3 +++
 5 files changed, 19 insertions(+), 5 deletions(-)
 rename frontend/src/business/components/performance/report/{PerformanceTestReport.vue => PerformanceTestReportList.vue} (95%)

diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
similarity index 95%
rename from frontend/src/business/components/performance/report/PerformanceTestReport.vue
rename to frontend/src/business/components/performance/report/PerformanceTestReportList.vue
index 8e46a0708d..ae9fa486ef 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
@@ -55,7 +55,7 @@
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="triggerMode" width="150" :label="'触发方式'" column-key="triggerMode"
+          <el-table-column prop="triggerMode" width="150" :label="$t('test_track.report.list.trigger_mode')" column-key="triggerMode"
                            :filters="triggerFilters">
             <template v-slot:default="scope">
               <report-trigger-mode-item :trigger-mode="scope.row.triggerMode"/>
@@ -76,6 +76,8 @@
             <template v-slot:default="scope">
               <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
                                         @exec="handleEdit(scope.row)" type="primary"/>
+              <ms-table-operator-button :tip="$t('load_test.report.diff')" icon="el-icon-more"
+                                        @exec="handleDiff(scope.row)" type="success"/>
               <ms-table-operator-button :is-tester-permission="true" :tip="$t('api_report.delete')"
                                         icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
             </template>
@@ -93,7 +95,7 @@ import MsTablePagination from "../../common/pagination/TablePagination";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceReportStatus from "./PerformanceReportStatus";
-import {getCurrentProjectID} from "../../../../common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ReportTriggerModeItem from "../../common/tableItem/ReportTriggerModeItem";
 import {REPORT_CONFIGS} from "../../common/components/search/search-components";
@@ -104,7 +106,7 @@ import {_filter, _sort} from "@/common/js/tableUtils";
 
 
 export default {
-  name: "PerformanceTestReport",
+  name: "PerformanceTestReportList",
   components: {
     MsTableHeader,
     ReportTriggerModeItem,
@@ -204,6 +206,9 @@ export default {
         }
       });
     },
+    handleDiff(report) {
+      console.log("aaa");
+    },
     _handleDeleteNoMsg(report) {
       this.result = this.$post(this.deletePath + report.id, {}, () => {
         this.initTableData();
diff --git a/frontend/src/business/components/performance/router.js b/frontend/src/business/components/performance/router.js
index 6f3e24799e..7b8f266e53 100644
--- a/frontend/src/business/components/performance/router.js
+++ b/frontend/src/business/components/performance/router.js
@@ -4,7 +4,7 @@ const PerformanceTest = () => import('@/business/components/performance/Performa
 const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
 const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
 const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList')
-const PerformanceTestReport = () => import('@/business/components/performance/report/PerformanceTestReport')
+const PerformanceTestReportList = () => import('@/business/components/performance/report/PerformanceTestReportList')
 const PerformanceChart = () => import('@/business/components/performance/report/components/PerformanceChart')
 const PerformanceReportView = () => import('@/business/components/performance/report/PerformanceReportView')
 
@@ -51,7 +51,7 @@ export default {
     {
       path: "report/:type",
       name: "perReport",
-      component: PerformanceTestReport
+      component: PerformanceTestReportList
     },
     {
       path: "chart",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 91e69c74ce..5233d03567 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -530,6 +530,9 @@ export default {
     load_exist_jmx: 'Load Project JMX',
     threadgroup_at_least_one: 'At least one ThreadGroup is enabled',
     load_api_automation_jmx: 'Import API automation scenario',
+    report: {
+      diff: "Compare"
+    }
   },
   api_test: {
     creator: "Creator",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index db08f19989..bb5755eea4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -529,6 +529,9 @@ export default {
     load_exist_jmx: '加载已有 JMX 文件',
     threadgroup_at_least_one: '至少启用一个线程组',
     load_api_automation_jmx: '引用接口自动化场景',
+    report: {
+      diff: "对比"
+    }
   },
   api_test: {
     creator: "创建人",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ccbc5805d6..47a4dec483 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -529,6 +529,9 @@ export default {
     load_exist_jmx: '加載已有 JMX 文件',
     threadgroup_at_least_one: '至少啟用一個線程組',
     load_api_automation_jmx: '引用接口自動化場景',
+    report: {
+      diff: "對比"
+    }
   },
   api_test: {
     creator: "創建人",

From 5f7d6b53707f957aba716810dea16c85035548bf Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 19 Mar 2021 17:39:34 +0800
Subject: [PATCH 02/18] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=AF=B9=E6=AF=94=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtLoadTestReportMapper.xml    |   3 +
 .../controller/request/ReportRequest.java     |   1 +
 .../report/PerformanceReportView.vue          |  13 ++-
 .../report/PerformanceTestReportList.vue      |  17 ++-
 .../report/components/CompareReports.vue      | 107 ++++++++++++++++++
 frontend/src/i18n/zh-CN.js                    |   2 +-
 frontend/src/i18n/zh-TW.js                    |   2 +-
 7 files changed, 130 insertions(+), 15 deletions(-)
 create mode 100644 frontend/src/business/components/performance/report/components/CompareReports.vue

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
index d89c770d7c..de1170833c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
@@ -91,6 +91,9 @@
             <if test="reportRequest.projectId != null">
                 AND project.id = #{reportRequest.projectId,jdbcType=VARCHAR}
             </if>
+            <if test="reportRequest.testId != null">
+                AND ltr.test_id = #{reportRequest.testId,jdbcType=VARCHAR}
+            </if>
             <if test="reportRequest.filters != null and reportRequest.filters.size() > 0">
                 <foreach collection="reportRequest.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java b/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java
index fa6b697f59..dac96b1de8 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java
@@ -12,6 +12,7 @@ import java.util.Map;
 public class ReportRequest {
     private String name;
     private String workspaceId;
+    private String testId;
     private String userId;
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 13a512d91e..0b4d28f1a0 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -25,13 +25,12 @@
               <el-button :disabled="isReadOnly" type="info" plain size="mini" @click="handleExport(reportName)">
                 {{ $t('test_track.plan_view.export_report') }}
               </el-button>
+              <el-button :disabled="isReadOnly || report.status !== 'Completed'" type="default" plain size="mini" @click="compareReports()">
+                {{ $t('report.compare') }}
+              </el-button>
               <el-button :disabled="isReadOnly" type="warning" plain size="mini" @click="downloadJtl()">
                 {{ $t('report.downloadJtl') }}
               </el-button>
-
-              <!--<el-button :disabled="isReadOnly" type="warning" plain size="mini">-->
-              <!--{{$t('report.compare')}}-->
-              <!--</el-button>-->
             </el-row>
           </el-col>
           <el-col :span="8">
@@ -83,6 +82,7 @@
         </div>
       </el-dialog>
     </ms-main-container>
+    <compare-reports ref="compareReports"/>
   </ms-container>
 </template>
 
@@ -99,11 +99,13 @@ import {checkoutTestManagerOrTestUser, exportPdf} from "@/common/js/utils";
 import html2canvas from 'html2canvas';
 import MsPerformanceReportExport from "./PerformanceReportExport";
 import {Message} from "element-ui";
+import CompareReports from "@/business/components/performance/report/components/CompareReports";
 
 
 export default {
   name: "PerformanceReportView",
   components: {
+    CompareReports,
     MsPerformanceReportExport,
     MsReportErrorLog,
     MsReportLogDetails,
@@ -312,6 +314,9 @@ export default {
           Message.error({message: JSON.parse(data).message || e.message, showClose: true});
         });
       });
+    },
+    compareReports() {
+      this.$refs.compareReports.open(this.report);
     }
   },
   created() {
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
index 934030190d..a1b1b2a038 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
@@ -25,31 +25,26 @@
           <el-table-column
             prop="name"
             :label="$t('commons.name')"
-            width="150"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="testName"
             :label="$t('report.test_name')"
-            width="150"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="projectName"
             :label="$t('report.project_name')"
-            width="150"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="userName"
             :label="$t('report.user_name')"
-            width="150"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="createTime"
             sortable
-            width="250"
             :label="$t('commons.create_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -76,8 +71,8 @@
             <template v-slot:default="scope">
               <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
                                         @exec="handleEdit(scope.row)" type="primary"/>
-              <ms-table-operator-button :tip="$t('load_test.report.diff')" icon="el-icon-more"
-                                        @exec="handleDiff(scope.row)" type="success"/>
+              <ms-table-operator-button :tip="$t('load_test.report.diff')" icon="el-icon-s-operation"
+                                        @exec="handleDiff(scope.row)" type="warning"/>
               <ms-table-operator-button :is-tester-permission="true" :tip="$t('api_report.delete')"
                                         icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
             </template>
@@ -87,6 +82,7 @@
                              :total="total"/>
       </el-card>
     </ms-main-container>
+    <compare-reports ref="compareReports"/>
   </ms-container>
 </template>
 
@@ -103,11 +99,14 @@ import MsTableHeader from "../../common/components/MsTableHeader";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 import ShowMoreBtn from "../../track/case/components/ShowMoreBtn";
 import {_filter, _sort} from "@/common/js/tableUtils";
-
+import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+import CompareReports from "@/business/components/performance/report/components/CompareReports";
 
 export default {
   name: "PerformanceTestReportList",
   components: {
+    CompareReports,
+    MsDialogFooter,
     MsTableHeader,
     ReportTriggerModeItem,
     MsTableOperatorButton,
@@ -203,7 +202,7 @@ export default {
       });
     },
     handleDiff(report) {
-      console.log("aaa");
+      this.$refs.compareReports.open(report);
     },
     _handleDeleteNoMsg(report) {
       this.result = this.$post(this.deletePath + report.id, {}, () => {
diff --git a/frontend/src/business/components/performance/report/components/CompareReports.vue b/frontend/src/business/components/performance/report/components/CompareReports.vue
new file mode 100644
index 0000000000..1dbf7e9724
--- /dev/null
+++ b/frontend/src/business/components/performance/report/components/CompareReports.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-dialog :close-on-click-modal="false"
+             :destroy-on-close="true"
+             :title="$t('已完成的测试报告')" width="50%"
+             :visible.sync="loadReportVisible">
+    <el-table v-loading="reportLoadingResult.loading"
+              class="basic-config"
+              :data="compareReports"
+              @select-all="handleSelectAll"
+              @select="handleSelectionChange">
+
+      <el-table-column type="selection"/>
+      <el-table-column
+        prop="name"
+        :label="$t('commons.name')"
+        show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        prop="userName"
+        :label="$t('report.user_name')"
+        show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        :label="$t('commons.create_time')">
+        <template v-slot:default="scope">
+          <i class="el-icon-time"/>
+          <span class="last-modified">{{ scope.row.createTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <ms-table-pagination :change="getCompareReports" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                         :total="total"/>
+
+    <template v-slot:footer>
+      <ms-dialog-footer @cancel="close" @confirm="handleCompare"/>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+
+export default {
+  name: "CompareReports",
+  components: {MsDialogFooter, MsTablePagination},
+  data() {
+    return {
+      loadReportVisible: false,
+      reportLoadingResult: {},
+      compareReports: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      selectIds: new Set,
+    }
+  },
+  methods: {
+    open(report) {
+      this.getCompareReports(report.testId);
+      this.loadReportVisible = true;
+    },
+    close() {
+      this.loadReportVisible = false;
+    },
+    getCompareReports(testId) {
+
+      let condition = {
+        testId: testId,
+        filters: {status: ["Completed"]}
+      };
+      this.reportLoadingResult = this.$post('/performance/report/list/all/' + this.currentPage + "/" + this.pageSize, condition, res => {
+        let data = res.data;
+        this.total = data.itemCount;
+        this.compareReports = data.listObject;
+      })
+    },
+    handleCompare() {
+      console.log(111);
+    },
+    handleSelectAll(selection) {
+      if (selection.length > 0) {
+        this.compareReports.forEach(item => {
+          this.selectIds.add(item.id);
+        });
+      } else {
+        this.compareReports.forEach(item => {
+          if (this.selectIds.has(item.id)) {
+            this.selectIds.delete(item.id);
+          }
+        });
+      }
+    },
+    handleSelectionChange(selection, row) {
+      if (this.selectIds.has(row.id)) {
+        this.selectIds.delete(row.id);
+      } else {
+        this.selectIds.add(row.id);
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c2fa1d548d..b260734629 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -433,7 +433,7 @@ export default {
     export: '导出',
     export_to_ms_format: '导出 Metersphere 格式',
     export_to_swagger3_format: '导出 Swagger3.0 格式',
-    compare: '比较',
+    compare: '报告对比',
     generation_error: '报告生成错误, 无法查看, 请检查日志详情!',
     being_generated: '报告正在生成中...',
     delete_confirm: '确认删除报告: ',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 2c521f51a2..05378aaf2b 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -433,7 +433,7 @@ export default {
     export: '導出',
     export_to_ms_format: '導出 Metersphere 格式',
     export_to_swagger3_format: '導出 Swagger3.0 格式',
-    compare: '比較',
+    compare: '報告比較',
     generation_error: '報告生成錯誤, 無法查看, 請檢查日誌詳情!',
     being_generated: '報告正在生成中...',
     delete_confirm: '確認刪除報告: ',

From c054c13a0639dd1827c23a547161e88aa761785b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 22 Mar 2021 09:34:23 +0800
Subject: [PATCH 03/18] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/PerformanceReportCompare.vue       | 39 +++++++++++++++++++
 .../report/PerformanceReportView.vue          |  6 +--
 .../report/PerformanceTestReportList.vue      |  6 +--
 ...CompareReports.vue => SameTestReports.vue} | 19 +++++++--
 .../business/components/performance/router.js |  8 +++-
 5 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 frontend/src/business/components/performance/report/PerformanceReportCompare.vue
 rename frontend/src/business/components/performance/report/components/{CompareReports.vue => SameTestReports.vue} (78%)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
new file mode 100644
index 0000000000..19ea78d52e
--- /dev/null
+++ b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
@@ -0,0 +1,39 @@
+<template>
+  <ms-container>
+    <ms-main-container>
+      sss
+    </ms-main-container>
+  </ms-container>
+</template>
+
+<script>
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
+
+export default {
+  name: "PerformanceReportCompare",
+  components: {MsMainContainer, MsContainer},
+  mounted() {
+    console.log(111);
+  },
+  computed: {
+    queryDataType: function () {
+      let reportIds = this.$route.params.reportIds;
+      return reportIds;
+    },
+    isReadOnly() {
+      return !checkoutTestManagerOrTestUser();
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 0b4d28f1a0..c496eb8646 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -82,7 +82,7 @@
         </div>
       </el-dialog>
     </ms-main-container>
-    <compare-reports ref="compareReports"/>
+    <same-test-reports ref="compareReports"/>
   </ms-container>
 </template>
 
@@ -99,13 +99,13 @@ import {checkoutTestManagerOrTestUser, exportPdf} from "@/common/js/utils";
 import html2canvas from 'html2canvas';
 import MsPerformanceReportExport from "./PerformanceReportExport";
 import {Message} from "element-ui";
-import CompareReports from "@/business/components/performance/report/components/CompareReports";
+import SameTestReports from "@/business/components/performance/report/components/SameTestReports";
 
 
 export default {
   name: "PerformanceReportView",
   components: {
-    CompareReports,
+    SameTestReports,
     MsPerformanceReportExport,
     MsReportErrorLog,
     MsReportLogDetails,
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
index a1b1b2a038..d8440fea96 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
@@ -82,7 +82,7 @@
                              :total="total"/>
       </el-card>
     </ms-main-container>
-    <compare-reports ref="compareReports"/>
+    <same-test-reports ref="compareReports"/>
   </ms-container>
 </template>
 
@@ -100,12 +100,12 @@ import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/L
 import ShowMoreBtn from "../../track/case/components/ShowMoreBtn";
 import {_filter, _sort} from "@/common/js/tableUtils";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-import CompareReports from "@/business/components/performance/report/components/CompareReports";
+import SameTestReports from "@/business/components/performance/report/components/SameTestReports";
 
 export default {
   name: "PerformanceTestReportList",
   components: {
-    CompareReports,
+    SameTestReports,
     MsDialogFooter,
     MsTableHeader,
     ReportTriggerModeItem,
diff --git a/frontend/src/business/components/performance/report/components/CompareReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
similarity index 78%
rename from frontend/src/business/components/performance/report/components/CompareReports.vue
rename to frontend/src/business/components/performance/report/components/SameTestReports.vue
index 1dbf7e9724..4e7164e494 100644
--- a/frontend/src/business/components/performance/report/components/CompareReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :close-on-click-modal="false"
              :destroy-on-close="true"
-             :title="$t('已完成的测试报告')" width="50%"
+             :title="$t('已完成的测试报告')" width="60%"
              :visible.sync="loadReportVisible">
     <el-table v-loading="reportLoadingResult.loading"
               class="basic-config"
@@ -20,6 +20,12 @@
         :label="$t('report.user_name')"
         show-overflow-tooltip>
       </el-table-column>
+      <el-table-column prop="triggerMode"
+                       :label="$t('test_track.report.list.trigger_mode')">
+        <template v-slot:default="scope">
+          <report-trigger-mode-item :trigger-mode="scope.row.triggerMode"/>
+        </template>
+      </el-table-column>
       <el-table-column
         :label="$t('commons.create_time')">
         <template v-slot:default="scope">
@@ -40,10 +46,12 @@
 <script>
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+import ReportTriggerModeItem from "@/business/components/common/tableItem/ReportTriggerModeItem";
+import {getUUID} from "@/common/js/utils";
 
 export default {
-  name: "CompareReports",
-  components: {MsDialogFooter, MsTablePagination},
+  name: "SameTestReports",
+  components: {ReportTriggerModeItem, MsDialogFooter, MsTablePagination},
   data() {
     return {
       loadReportVisible: false,
@@ -76,7 +84,10 @@ export default {
       })
     },
     handleCompare() {
-      console.log(111);
+      console.log(123);
+      let reportIds = [...this.selectIds];
+      let uuid = getUUID();
+      this.$router.push({path: '/performance/report/compare', params: {redirectID: uuid, reportIds: reportIds}});
     },
     handleSelectAll(selection) {
       if (selection.length > 0) {
diff --git a/frontend/src/business/components/performance/router.js b/frontend/src/business/components/performance/router.js
index 7b8f266e53..67bbfdc059 100644
--- a/frontend/src/business/components/performance/router.js
+++ b/frontend/src/business/components/performance/router.js
@@ -7,6 +7,7 @@ const PerformanceTestList = () => import('@/business/components/performance/test
 const PerformanceTestReportList = () => import('@/business/components/performance/report/PerformanceTestReportList')
 const PerformanceChart = () => import('@/business/components/performance/report/components/PerformanceChart')
 const PerformanceReportView = () => import('@/business/components/performance/report/PerformanceReportView')
+const PerformanceReportCompare = () => import('@/business/components/performance/report/PerformanceReportCompare')
 
 export default {
   path: "/performance",
@@ -62,6 +63,11 @@ export default {
       path: "report/view/:reportId",
       name: "perReportView",
       component: PerformanceReportView
-    }
+    },
+    {
+      path: "report/compare",
+      name: "ReportCompare",
+      component: PerformanceReportCompare,
+    },
   ]
 }

From 119f15d475067e1eb330adb51d8d143db442e9e7 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 22 Mar 2021 13:31:17 +0800
Subject: [PATCH 04/18] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/PerformanceReportCompare.vue | 13 +++++++------
 .../report/components/SameTestReports.vue           |  7 +++----
 .../src/business/components/performance/router.js   |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
index 19ea78d52e..3193c0c973 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
@@ -1,7 +1,9 @@
 <template>
   <ms-container>
     <ms-main-container>
-      sss
+      <el-card>
+
+      </el-card>
     </ms-main-container>
   </ms-container>
 </template>
@@ -15,13 +17,12 @@ export default {
   name: "PerformanceReportCompare",
   components: {MsMainContainer, MsContainer},
   mounted() {
-    console.log(111);
+    let reportId = this.$route.path.split('/')[4];
+    console.log(reportId);
+    let items = localStorage.getItem("compareReportIds");
+    console.log(JSON.parse(items));
   },
   computed: {
-    queryDataType: function () {
-      let reportIds = this.$route.params.reportIds;
-      return reportIds;
-    },
     isReadOnly() {
       return !checkoutTestManagerOrTestUser();
     }
diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
index 4e7164e494..6e203f66fb 100644
--- a/frontend/src/business/components/performance/report/components/SameTestReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -47,7 +47,6 @@
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import ReportTriggerModeItem from "@/business/components/common/tableItem/ReportTriggerModeItem";
-import {getUUID} from "@/common/js/utils";
 
 export default {
   name: "SameTestReports",
@@ -84,10 +83,10 @@ export default {
       })
     },
     handleCompare() {
-      console.log(123);
       let reportIds = [...this.selectIds];
-      let uuid = getUUID();
-      this.$router.push({path: '/performance/report/compare', params: {redirectID: uuid, reportIds: reportIds}});
+      localStorage.setItem("compareReportIds", JSON.stringify(reportIds));
+      this.close();
+      this.$router.push({path: '/performance/report/compare/' + reportIds[0]});
     },
     handleSelectAll(selection) {
       if (selection.length > 0) {
diff --git a/frontend/src/business/components/performance/router.js b/frontend/src/business/components/performance/router.js
index 67bbfdc059..4ea1fe4d8c 100644
--- a/frontend/src/business/components/performance/router.js
+++ b/frontend/src/business/components/performance/router.js
@@ -1,5 +1,3 @@
-import MsProject from "@/business/components/settings/project/MsProject";
-
 const PerformanceTest = () => import('@/business/components/performance/PerformanceTest')
 const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
 const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
@@ -65,7 +63,7 @@ export default {
       component: PerformanceReportView
     },
     {
-      path: "report/compare",
+      path: "report/compare/:reportId",
       name: "ReportCompare",
       component: PerformanceReportCompare,
     },

From 321a35aeabef14792047a6d9070fad0ee8944c54 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 25 Mar 2021 16:59:09 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=A3=E4=B8=8D?=
 =?UTF-8?q?=E8=B6=85=E8=BF=875=E4=B8=AA=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=BB=9A=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

文档不超过5个数据时下滚出现问题
---
 .../definition/components/document/ApiDocumentAnchor.vue  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue b/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
index 194605f3ad..5b28afe295 100644
--- a/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
+++ b/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
@@ -643,7 +643,7 @@ export default {
 
         if(lastIndex < this.currentApiIndexInApiShowArray){
           //上移
-          if(this.needAsyncSelect){
+          // if(this.needAsyncSelect){
             //进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据，
             //可得： apiStepIndex-1- 2 < apiInfoArray，需要添加数据
             let dataIndex = this.apiStepIndex -3;
@@ -657,11 +657,11 @@ export default {
             if(this.apiShowArray.length > (this.currentApiIndexInApiShowArray+3)){
               this.apiShowArray.pop();
             }
-          }
+          // }
           this.apiStepIndex --;
         }else if(lastIndex > this.currentApiIndexInApiShowArray){
           //下滚
-          if(this.needAsyncSelect){
+          // if(this.needAsyncSelect){
             //进行判断：是否还需要为apiShowArray 增加数据。 由于在当前数据前后最多展现2条数据，
             //可得： apiStepIndex+1+ 2 < apiInfoArray，需要添加数据
             let dataIndex = this.apiStepIndex +3;
@@ -678,7 +678,7 @@ export default {
               let itemHeight = this.$refs.apiDocInfoDivItem[0].offsetHeight+10;
               this.$refs.apiDocInfoDiv.scrollTop = (apiDocDivScrollTop-itemHeight);
             }
-          }
+          // }
           this.apiStepIndex ++;
         }
       }

From 01799cd93707b181d82c0135db746c46d2e921e6 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:02:36 +0800
Subject: [PATCH 06/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ApiTestCaseController.java | 16 ++++++++++----
 .../api/jmeter/APIBackendListenerClient.java  |  8 +++----
 .../api/service/ApiTestCaseService.java       | 10 ++++++++-
 .../track/service/TestPlanApiCaseService.java | 22 +++++++++----------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
index 3affea3472..9a3fe96e37 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
@@ -7,12 +7,12 @@ import io.metersphere.api.dto.definition.*;
 import io.metersphere.api.service.ApiTestCaseService;
 import io.metersphere.base.domain.ApiTestCase;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
-import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
+import io.metersphere.track.service.TestPlanApiCaseService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +29,8 @@ public class ApiTestCaseController {
 
     @Resource
     private ApiTestCaseService apiTestCaseService;
-
+    @Resource
+    private TestPlanApiCaseService testPlanApiCaseService;
     @PostMapping("/list")
     public List<ApiTestCaseResult> list(@RequestBody ApiTestCaseRequest request) {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
@@ -48,6 +49,12 @@ public class ApiTestCaseController {
             return null;
         }
     }
+    @GetMapping("/getStateByTestPlan/{id}")
+    public String getStateByTestPlan(@PathVariable String id ) {
+        String status=testPlanApiCaseService.getState(id);
+        return status;
+
+    }
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<ApiTestCaseDTO>> listSimple(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiTestCaseRequest request) {
@@ -131,7 +138,8 @@ public class ApiTestCaseController {
         return apiTestCaseService.run(request);
     }
     @GetMapping(value = "/jenkins/exec/result/{id}")
-    public String getExecResult(@PathVariable String  id) {
-        return apiTestCaseService.getExecResult(id);
+    public String getExecResult(@PathVariable String id) {
+           return  apiTestCaseService.getExecResult(id);
+
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index d4e00b2cda..1c3889d6bf 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -1,12 +1,10 @@
 package io.metersphere.api.jmeter;
 
-import io.metersphere.api.dto.definition.ApiTestCaseInfo;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.service.*;
 import io.metersphere.base.domain.ApiDefinitionExecResult;
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiTestReport;
-import io.metersphere.base.domain.TestPlanReport;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
@@ -16,7 +14,6 @@ import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
 import io.metersphere.track.service.TestPlanReportService;
-import io.metersphere.track.service.TestPlanService;
 import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -250,7 +247,10 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
 
             }
         }
-        sendTask(report, reportUrl, testResult);
+        if (StringUtils.equals(ReportTriggerMode.API.name(), report.getTriggerMode())||StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), report.getTriggerMode())) {
+            sendTask(report, reportUrl, testResult);
+        }
+
     }
 
     private static void sendTask(ApiTestReport report, String reportUrl, TestResult testResult) {
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 12730c5308..aa7f0724a4 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -19,6 +19,7 @@ import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.*;
+import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
@@ -551,7 +552,14 @@ public class ApiTestCaseService {
     }
 
     public String run(RunCaseRequest request) {
-        ApiTestCaseWithBLOBs testCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
+        ApiTestCaseWithBLOBs testCaseWithBLOBs=new ApiTestCaseWithBLOBs();
+        if(StringUtils.equals(request.getRunMode(), ApiRunMode.JENKINS_API_PLAN.name())){
+            testCaseWithBLOBs= apiTestCaseMapper.selectByPrimaryKey(request.getReportId());
+            request.setCaseId(request.getReportId());
+        }else{
+            testCaseWithBLOBs= apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
+
+        }
         // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
         if (testCaseWithBLOBs != null && StringUtils.isNotEmpty(testCaseWithBLOBs.getRequest())) {
             try {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index df789f41ad..ad98f6fb27 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -1,21 +1,13 @@
 package io.metersphere.track.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.api.dto.definition.ApiTestCaseDTO;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
-import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
-import io.metersphere.api.dto.definition.request.MsTestElement;
-import io.metersphere.api.dto.definition.request.MsTestPlan;
-import io.metersphere.api.dto.definition.request.MsThreadGroup;
 import io.metersphere.api.service.ApiDefinitionExecResultService;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
-import io.metersphere.base.domain.ApiTestCaseExample;
-import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.base.domain.TestPlanApiCase;
 import io.metersphere.base.domain.TestPlanApiCaseExample;
 import io.metersphere.base.mapper.TestPlanApiCaseMapper;
@@ -25,15 +17,16 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
-import org.apache.jmeter.testelement.TestElement;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -150,4 +143,11 @@ public class TestPlanApiCaseService {
             });
         }
     }
+
+    public String getState(String id) {
+        TestPlanApiCaseExample example = new TestPlanApiCaseExample();
+        example.createCriteria().andApiCaseIdEqualTo(id);
+        return testPlanApiCaseMapper.selectByExample(example).get(0).getStatus();
+
+    }
 }

From deaf05dd5f63bd17ee2a5564b0611dc0efcccb4b Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 26 Mar 2021 13:14:43 +0800
Subject: [PATCH 07/18] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8Bjs=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V79__v1.8.1_release.sql     |  2 --
 .../components/track/case/components/TestCaseEdit.vue  | 10 ++++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 backend/src/main/resources/db/migration/V79__v1.8.1_release.sql

diff --git a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql
deleted file mode 100644
index 8c15c4fe47..0000000000
--- a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- api_scenario_report modify column length
-ALTER TABLE api_scenario_report MODIFY COLUMN name VARCHAR(300);
\ No newline at end of file
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index e0b0603e7f..4203d0a7f3 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -631,8 +631,11 @@ export default {
       })
     },
     async setFormData(testCase) {
-      //testCase.tags = JSON.parse(testCase.tags);
-      testCase.selected = JSON.parse(testCase.testId);
+      try {
+        testCase.selected = JSON.parse(testCase.testId);
+      } catch (error) {
+        testCase.selected = testCase.testId
+      }
       let tmp = {};
       Object.assign(tmp, testCase);
       tmp.steps = JSON.parse(testCase.steps);
@@ -643,9 +646,8 @@ export default {
       Object.assign(this.form, tmp);
       this.form.module = testCase.nodeId;
       this.getFileMetaData(testCase);
-      /* testCase.selected = JSON.parse(testCase.testId);
-       this.form.selected= testCase.selected*/
       await this.loadOptions(this.sysList)
+
     },
     setTestCaseExtInfo(testCase) {
       this.testCase = {};

From 371628ba54cf890ba2cbb441e1ee63ff08a44706 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 14:10:04 +0800
Subject: [PATCH 08/18] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 3 +--
 frontend/src/i18n/zh-CN.js | 1 -
 frontend/src/i18n/zh-TW.js | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 9927778f64..6bb2e796a7 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -541,11 +541,10 @@ export default {
     threadgroup_at_least_one: 'At least one ThreadGroup is enabled',
     load_api_automation_jmx: 'Import API automation scenario',
     project_file_exist: "The file already exists in the project, please import it directly",
+    project_file_update_type_error: 'Updated file types must be consistent',
     report: {
       diff: "Compare"
     },
-    project_file_exist: "The file already exists in the project, please import it directly",
-    project_file_update_type_error: 'Updated file types must be consistent'
   },
   api_test: {
     creator: "Creator",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 297384e97d..5d8f6e15f0 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -544,7 +544,6 @@ export default {
       diff: "对比"
     },
     project_file_update_type_error: '更新的文件类型必须一致',
-    project_file_exist: "项目中已存在该文件，请直接引用"
   },
   api_test: {
     creator: "创建人",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index f766fa4afb..f7543a2c97 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -540,11 +540,10 @@ export default {
     threadgroup_at_least_one: '至少啟用一個線程組',
     load_api_automation_jmx: '引用接口自動化場景',
     project_file_exist: "項目中已存在該文件，請直接引用",
+    project_file_update_type_error: '更新的文件類型必須一致',
     report: {
       diff: "對比"
     },
-    project_file_exist: "項目中已存在該文件，請直接引用",
-    project_file_update_type_error: '更新的文件類型必須一致'
   },
   api_test: {
     creator: "創建人",

From b29d302ad271f392a0660d75ce1f7a97cf393aa1 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 14:21:13 +0800
Subject: [PATCH 09/18] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A0=87=E9=A2=98=20KO=20->=20FAIL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/components/RequestStatistics.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/components/RequestStatistics.vue b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
index bbfd104715..06e59e8851 100644
--- a/frontend/src/business/components/performance/report/components/RequestStatistics.vue
+++ b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
@@ -37,7 +37,7 @@
 
         <el-table-column
           prop="ko"
-          label="KO"
+          label="FAIL"
           align="center"
         />
 

From d12ec06066e49d9c270d926d703096ea25483cf5 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 26 Mar 2021 17:16:08 +0800
Subject: [PATCH 10/18] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E7=94=A8=E4=BE=8B=E9=87=8D=E5=A4=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/controller/TestCaseController.java  |  6 ++--
 .../track/service/TestCaseService.java        |  2 +-
 .../components/track/case/TestCase.vue        | 14 ++++++++-
 .../track/case/components/TestCaseEdit.vue    | 29 +++++++++++--------
 frontend/src/i18n/en-US.js                    |  2 +-
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    |  2 +-
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
index b359daf3af..1747f0a3c5 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -14,13 +14,11 @@ import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.service.CheckPermissionService;
 import io.metersphere.service.FileService;
 import io.metersphere.track.dto.TestCaseDTO;
-import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.request.testcase.EditTestCaseRequest;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
 import io.metersphere.track.request.testcase.TestCaseMinderEditRequest;
 import io.metersphere.track.request.testplan.FileOperationRequest;
-import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.track.service.TestCaseService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -126,8 +124,8 @@ public class TestCaseController {
 
     @PostMapping(value = "/edit", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public void editTestCase(@RequestPart("request") EditTestCaseRequest request, @RequestPart(value = "file") List<MultipartFile> files) {
-        testCaseService.edit(request, files);
+    public String editTestCase(@RequestPart("request") EditTestCaseRequest request, @RequestPart(value = "file") List<MultipartFile> files) {
+        return testCaseService.edit(request, files);
     }
 
     @PostMapping("/delete/{testCaseId}")
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 0829f73e25..a1c9e4aed3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -165,7 +165,7 @@ public class TestCaseService {
                     String steps = tc.getSteps();
                     String remark = tc.getRemark();
                     if (StringUtils.equals(steps, testCase.getSteps()) && StringUtils.equals(remark, caseRemark)) {
-                         MSException.throwException(Translator.get("test_case_already_exists"));
+                         //MSException.throwException(Translator.get("test_case_already_exists"));
                         isExt = true;
                     }
                 }
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 88d25907b2..53bf826565 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -323,11 +323,23 @@ export default {
     showTestCaseDetail(testCase) {
       this.testCaseReadOnly = true;
     },
-    refresh() {
+    refresh(data) {
       this.selectNodeIds = [];
       this.selectParentNodes = [];
       this.selectNode = {};
       this.refreshTable();
+      this.setTable(data);
+
+    },
+    setTable(data) {
+      console.log(data)
+      for (let index in this.tabs) {
+        let tab = this.tabs[index];
+        if (tab.name === this.activeName) {
+          tab.label = data.name;
+          break;
+        }
+      }
     },
     refreshAll() {
       this.$refs.nodeTree.list();
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 4203d0a7f3..d9f4e9823f 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -380,6 +380,7 @@ export default {
       testCases: [],
       index: 0,
       showInputTag: true,
+      tableType:"",
     };
   },
   props: {
@@ -712,11 +713,6 @@ export default {
       this.dialogFormVisible = false;
     },
     saveCase() {
-      /*
-            document.getElementById("inputDelay").focus();
-      */
-
-      //  保存前在input框自动失焦，以免保存失败
       this.$refs['caseFrom'].validate((valid) => {
         if (valid) {
           let param = this.buildParam();
@@ -724,7 +720,10 @@ export default {
             let option = this.getOption(param);
             this.result = this.$request(option, (response) => {
               this.$success(this.$t('commons.save_success'));
-              if (this.operationType == 'add' && this.isCreateContinue) {
+              this.operationType="edit"
+              this.form.id=response.id;
+              this.$emit("refreshTestCase",)
+              /*if (this.operationType == 'add' && this.isCreateContinue) {
                 this.form.name = '';
                 this.form.prerequisite = '';
                 this.form.steps = [{
@@ -738,9 +737,11 @@ export default {
                 this.tableData = [];
                 this.$emit("refresh");
                 return;
-              }
-              this.dialogFormVisible = false;
-              this.$emit("refresh");
+              }*/
+              this.tableType='edit';
+              this.$emit("refresh",this.form);
+              console.log(response.data)
+              this.form.id=response.data
               if (this.type === 'add' || this.type === 'copy') {
                 param.id = response.data;
                 this.$emit("caseCreate", param);
@@ -779,11 +780,15 @@ export default {
       return param;
     },
     getOption(param) {
-      let formData = new FormData();
-      let type = this.type
-      if (this.type === 'copy') {
+      let type={}
+      if(this.tableType==='edit'){
+        type='edit'
+      }else if(this.type === 'copy'){
         type = 'add'
+      }else{
+        type=this.type
       }
+      let formData = new FormData();
       let url = '/test/case/' + type;
       this.uploadList.forEach(f => {
         formData.append("file", f);
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a563e26c77..8d1e6249ac 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -280,7 +280,7 @@ export default {
     none: 'None Organization',
     select: 'Select Organization',
     service_integration: 'Service integration',
-    defect_manage: 'Defect management platform',
+    defect_manage: 'Project management platform',
     message_settings: 'Message settings',
     message: {
       jenkins_task_notification: 'Jenkins task notification',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 8c5bcc9afc..051d1beade 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -281,7 +281,7 @@ export default {
     select: '选择组织',
     delete_warning: '删除该组织将同步删除该组织下所有相关工作空间和相关工作空间下的所有项目，以及项目中的所有用例、接口测试、性能测试等,确定要删除吗?',
     service_integration: '服务集成',
-    defect_manage: '缺陷管理平台',
+    defect_manage: '项目管理平台',
     message_settings: '消息设置',
     message: {
       jenkins_task_notification: 'Jenkins接口调用任务通知',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 61aaa62a43..9af910bb64 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -281,7 +281,7 @@ export default {
     select: '選擇組織',
     delete_warning: '刪除該組織將同步刪除該組織下所有相關工作空間和相關工作空間下的所有項目，以及項目中的所有用例、接口測試、性能測試等,確定要刪除嗎?',
     service_integration: '服務集成',
-    defect_manage: '缺陷管理平臺',
+    defect_manage: '項目管理平臺',
     message_settings: '消息設置',
     message: {
       jenkins_task_notification: 'Jenkins接口調用任務通知',

From 8f06031cec93fbe584019736a00005a95598f290 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:03:00 +0800
Subject: [PATCH 11/18] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E7=82=B9=E5=87=BB=E6=A0=91=E8=8F=9C=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=81=A2=E5=A4=8D=E5=88=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/request/sampler/MsHTTPSamplerProxy.java   | 9 ++++++++-
 frontend/src/business/components/track/case/TestCase.vue | 1 +
 frontend/src/business/components/xpack                   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index ecf3e2b261..b5c2c8f85e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -183,9 +183,16 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 if (!url.startsWith("http://") && !url.startsWith("https://")) {
                     url = "http://" + url;
                 }
+                if (StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
+                    url.replaceAll(this.getPort(), "10990");
+                }
                 URL urlObject = new URL(url);
                 sampler.setDomain(URLDecoder.decode(urlObject.getHost(), "UTF-8"));
-                sampler.setPort(urlObject.getPort());
+                if (urlObject.getPort() > 0 && urlObject.getPort() != 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
+                    sampler.setPort(urlObject.getPort());
+                } else {
+                    sampler.setProperty("HTTPSampler.port", this.getPort());
+                }
                 sampler.setProtocol(urlObject.getProtocol());
                 String envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getPath();
                 sampler.setPath(envPath);
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 88d25907b2..1833e97458 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -285,6 +285,7 @@ export default {
       }
     },
     nodeChange(node, nodeIds, pNodes) {
+      this.activeName = "default";
       this.selectNodeIds = nodeIds;
       this.selectNode = node;
       this.selectParentNodes = pNodes;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2115bd28a9..07951ba17a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2115bd28a90854d2b6276a90878934715498c584
+Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd

From e26561e464bb87edc2b5e893d674129c8ae8480c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:03:58 +0800
Subject: [PATCH 12/18] =?UTF-8?q?feat(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/PerformanceReportCompare.vue       |  48 ++++-
 .../report/PerformanceReportView.vue          |   2 +
 .../report/components/LoadCompareCard.vue     | 182 +++++++++++++++++
 .../report/components/OverviewCompareCard.vue |  67 +++++++
 .../components/ResponseTimeCompareCard.vue    | 188 ++++++++++++++++++
 .../report/components/SameTestReports.vue     |  45 +++--
 6 files changed, 507 insertions(+), 25 deletions(-)
 create mode 100644 frontend/src/business/components/performance/report/components/LoadCompareCard.vue
 create mode 100644 frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
 create mode 100644 frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue

diff --git a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
index 3193c0c973..5e80cfa5e2 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
@@ -1,9 +1,21 @@
 <template>
   <ms-container>
     <ms-main-container>
-      <el-card>
-
-      </el-card>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <overview-compare-card ref="overviewCard"/>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <load-compare-card ref="loadCard"/>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <response-time-compare-card ref="responseTimeCard"/>
+        </el-col>
+      </el-row>
     </ms-main-container>
   </ms-container>
 </template>
@@ -12,15 +24,16 @@
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
+import OverviewCompareCard from "@/business/components/performance/report/components/OverviewCompareCard";
+import MsChart from "@/business/components/common/chart/MsChart";
+import LoadCompareCard from "@/business/components/performance/report/components/LoadCompareCard";
+import ResponseTimeCompareCard from "@/business/components/performance/report/components/ResponseTimeCompareCard";
 
 export default {
   name: "PerformanceReportCompare",
-  components: {MsMainContainer, MsContainer},
+  components: {ResponseTimeCompareCard, LoadCompareCard, MsChart, OverviewCompareCard, MsMainContainer, MsContainer},
   mounted() {
-    let reportId = this.$route.path.split('/')[4];
-    console.log(reportId);
-    let items = localStorage.getItem("compareReportIds");
-    console.log(JSON.parse(items));
+    this.init();
   },
   computed: {
     isReadOnly() {
@@ -30,11 +43,28 @@ export default {
   data() {
     return {}
   },
-  methods: {}
+  methods: {
+    init() {
+      this.$refs.overviewCard.initTable();
+      this.$refs.loadCard.initCard();
+      this.$refs.responseTimeCard.initCard();
+    }
+  },
+  watch: {
+    '$route'(to) {
+      if (to.name !== "ReportCompare") {
+        return;
+      }
 
+      this.init();
+    }
+  }
 }
 </script>
 
 <style scoped>
+.el-row {
+  padding-bottom: 20px;
+}
 
 </style>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index c496eb8646..d7934bc6b2 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -332,6 +332,8 @@ export default {
         this.$set(this.report, "id", this.reportId);
         this.$set(this.report, "status", data.status);
         this.$set(this.report, "testId", data.testId);
+        this.$set(this.report, "name", data.name);
+        this.$set(this.report, "createTime", data.createTime);
         this.$set(this.report, "loadConfiguration", data.loadConfiguration);
         this.checkReportStatus(data.status);
         if (this.status === "Completed" || this.status === "Running") {
diff --git a/frontend/src/business/components/performance/report/components/LoadCompareCard.vue b/frontend/src/business/components/performance/report/components/LoadCompareCard.vue
new file mode 100644
index 0000000000..8cba2a523f
--- /dev/null
+++ b/frontend/src/business/components/performance/report/components/LoadCompareCard.vue
@@ -0,0 +1,182 @@
+<template>
+  <el-card>
+    <template v-slot:header>
+      <span class="title">Load</span>
+    </template>
+    <div v-for="(option, index) in loadList" :key="index">
+      <ms-chart ref="chart1" :options="option" :autoresize="true"></ms-chart>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import MsChart from "@/business/components/common/chart/MsChart";
+
+export default {
+  name: "LoadCompareCard",
+  components: {MsChart},
+  data() {
+    return {
+      loadList: []
+    }
+  },
+  methods: {
+    initCard() {
+      this.loadList = [];
+      this.reportId = this.$route.path.split('/')[4];
+      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
+
+      this.compareReports.forEach(report => {
+        this.initOverview(report);
+      })
+    },
+    initOverview(report) {
+      this.$get("/performance/report/content/load_chart/" + report.id).then(res => {
+        let data = res.data.data;
+        let yAxisList = data.filter(m => m.yAxis2 === -1).map(m => m.yAxis);
+        let yAxis2List = data.filter(m => m.yAxis === -1).map(m => m.yAxis2);
+        let yAxisListMax = this._getChartMax(yAxisList);
+        let yAxis2ListMax = this._getChartMax(yAxis2List);
+
+        let yAxisIndex0List = data.filter(m => m.yAxis2 === -1).map(m => m.groupName);
+        yAxisIndex0List = this._unique(yAxisIndex0List);
+        let yAxisIndex1List = data.filter(m => m.yAxis === -1).map(m => m.groupName);
+        yAxisIndex1List = this._unique(yAxisIndex1List);
+
+        let loadOption = {
+          title: {
+            text: report.name + " " + this.$options.filters['timestampFormatDate'](report.createTime),
+            left: 'center',
+            top: 20,
+            textStyle: {
+              color: '#65A2FF'
+            },
+          },
+          tooltip: {
+            show: true,
+            trigger: 'axis',
+            // extraCssText: 'z-index: 999;',
+            confine: true,
+          },
+          legend: {},
+          xAxis: {},
+          yAxis: [{
+            name: 'User',
+            type: 'value',
+            min: 0,
+            max: yAxisListMax,
+            splitNumber: 5,
+            interval: yAxisListMax / 5
+          },
+            {
+              name: 'Transactions/s',
+              type: 'value',
+              splitNumber: 5,
+              min: 0,
+              max: yAxis2ListMax,
+              interval: yAxis2ListMax / 5
+            }
+          ],
+          series: []
+        };
+        let setting = {
+          series: [
+            {
+              name: 'users',
+              color: '#0CA74A',
+            },
+            {
+              name: 'hits',
+              yAxisIndex: '1',
+              color: '#65A2FF',
+            },
+            {
+              name: 'errors',
+              yAxisIndex: '1',
+              color: '#E6113C',
+            }
+          ]
+        }
+        yAxisIndex0List.forEach(item => {
+          setting["series"].splice(0, 0, {name: item, yAxisIndex: '0'})
+        })
+
+        yAxisIndex1List.forEach(item => {
+          setting["series"].splice(0, 0, {name: item, yAxisIndex: '1'})
+        })
+        this.loadList.push(this.generateOption(loadOption, data, setting));
+      }).catch(() => {
+        this.loadList = [];
+      })
+    },
+    generateOption(option, data, setting) {
+      let chartData = data;
+      let seriesArray = [];
+      for (let set in setting) {
+        if (set === "series") {
+          seriesArray = setting[set];
+          continue;
+        }
+        this.$set(option, set, setting[set]);
+      }
+      let legend = [], series = {}, xAxis = [], seriesData = [];
+      chartData.forEach(item => {
+        if (!xAxis.includes(item.xAxis)) {
+          xAxis.push(item.xAxis);
+        }
+        xAxis.sort()
+        let name = item.groupName
+        if (!legend.includes(name)) {
+          legend.push(name)
+          series[name] = []
+        }
+        if (item.yAxis === -1) {
+          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis2.toFixed(2)]);
+        } else {
+          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis.toFixed(2)]);
+        }
+      })
+      this.$set(option.legend, "data", legend);
+      this.$set(option.legend, "type", "scroll");
+      this.$set(option.legend, "bottom", "10px");
+      this.$set(option.xAxis, "data", xAxis);
+      for (let name in series) {
+        let d = series[name];
+        d.sort((a, b) => a[0].localeCompare(b[0]));
+        let items = {
+          name: name,
+          type: 'line',
+          data: d,
+          smooth: true
+        };
+        let seriesArrayNames = seriesArray.map(m => m.name);
+        if (seriesArrayNames.includes(name)) {
+          for (let j = 0; j < seriesArray.length; j++) {
+            let seriesObj = seriesArray[j];
+            if (seriesObj['name'] === name) {
+              Object.assign(items, seriesObj);
+            }
+          }
+        }
+        seriesData.push(items);
+      }
+      this.$set(option, "series", seriesData);
+      return option;
+    },
+    _getChartMax(arr) {
+      const max = Math.max(...arr);
+      return Math.ceil(max / 4.5) * 5;
+    },
+    _unique(arr) {
+      return Array.from(new Set(arr));
+    }
+  }
+}
+</script>
+
+<style scoped>
+.echarts {
+  width: 100%;
+  height: 300px;
+}
+</style>
diff --git a/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue b/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
new file mode 100644
index 0000000000..18298b9967
--- /dev/null
+++ b/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
@@ -0,0 +1,67 @@
+<template>
+  <el-card class="table-card">
+    <template v-slot:header>
+      <span class="title">Overview</span>
+    </template>
+    <el-table border :data="overviewList" class="adjust-table test-content">
+      <el-table-column prop="name" :label="$t('commons.name')"/>
+      <el-table-column prop="createTime" :label="$t('commons.create_time')">
+        <template v-slot:default="scope">
+          <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="maxUsers" label="Max Users"/>
+      <el-table-column prop="avgTransactions" label="Avg.Transactions"/>
+      <el-table-column prop="errors" label="Errors"/>
+      <el-table-column prop="avgResponseTime" label="Avg.Response Time"/>
+      <el-table-column prop="responseTime90" label="90% Response Time"/>
+      <el-table-column prop="avgBandwidth" label="Avg.Bandwidth"/>
+    </el-table>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: "OverviewCompareCard",
+  data() {
+    return {
+      reportId: null,
+      compareReports: [],
+      overviewList: [],
+    };
+  },
+  methods: {
+    initTable() {
+      this.overviewList = [];
+
+      this.reportId = this.$route.path.split('/')[4];
+      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
+
+      this.compareReports.forEach(report => {
+        this.initOverview(report);
+      })
+    },
+    initOverview(report) {
+      this.$get("/performance/report/content/testoverview/" + report.id).then(res => {
+        let data = res.data.data;
+        this.overviewList.push({
+          name: report.name,
+          createTime: report.createTime,
+          maxUsers: data.maxUsers,
+          avgThroughput: data.avgThroughput,
+          avgTransactions: data.avgTransactions,
+          errors: data.errors,
+          avgResponseTime: data.avgResponseTime,
+          responseTime90: data.responseTime90,
+          avgBandwidth: data.avgBandwidth,
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue b/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue
new file mode 100644
index 0000000000..1f48b5ea2c
--- /dev/null
+++ b/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue
@@ -0,0 +1,188 @@
+<template>
+  <el-card>
+    <template v-slot:header>
+      <span class="title">Response Time</span>
+    </template>
+    <div v-for="(option, index) in responseTimeList" :key="index">
+      <ms-chart ref="chart1" :options="option" :autoresize="true"></ms-chart>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import MsChart from "@/business/components/common/chart/MsChart";
+
+export default {
+  name: "ResponseTimeCompareCard",
+  components: {MsChart},
+  data() {
+    return {
+      responseTimeList: []
+    }
+  },
+  methods: {
+    initCard() {
+      this.responseTimeList = [];
+      this.reportId = this.$route.path.split('/')[4];
+      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
+
+      this.compareReports.forEach(report => {
+        this.initOverview(report);
+      })
+    },
+    initOverview(report) {
+      this.$get("/performance/report/content/res_chart/" + report.id).then(res => {
+        let data = res.data.data;
+        let yAxisList = data.filter(m => m.yAxis2 === -1).map(m => m.yAxis);
+        let yAxis2List = data.filter(m => m.yAxis === -1).map(m => m.yAxis2);
+        let yAxisListMax = this._getChartMax(yAxisList);
+        let yAxis2ListMax = this._getChartMax(yAxis2List);
+
+        let yAxisIndex0List = data.filter(m => m.yAxis2 === -1).map(m => m.groupName);
+        yAxisIndex0List = this._unique(yAxisIndex0List);
+        let yAxisIndex1List = data.filter(m => m.yAxis === -1).map(m => m.groupName);
+        yAxisIndex1List = this._unique(yAxisIndex1List);
+
+        let resOption = {
+          title: {
+            text: report.name + " " + this.$options.filters['timestampFormatDate'](report.createTime),
+            left: 'center',
+            top: 20,
+            textStyle: {
+              color: '#99743C'
+            },
+          },
+          tooltip: {
+            show: true,
+            trigger: 'axis',
+            // extraCssText: 'z-index: 999;',
+            confine: true,
+            formatter: function (params, ticket, callback) {
+              let result = "";
+              let name = params[0].name;
+              result += name + "<br/>";
+              for (let i = 0; i < params.length; i++) {
+                let seriesName = params[i].seriesName;
+                if (seriesName.length > 100) {
+                  seriesName = seriesName.substring(0, 100);
+                }
+                let value = params[i].value;
+                let marker = params[i].marker;
+                result += marker + seriesName + ": " + value[1] + "<br/>";
+              }
+
+              return result;
+            }
+          },
+          legend: {},
+          xAxis: {},
+          yAxis: [{
+            name: 'User',
+            type: 'value',
+            min: 0,
+            max: yAxisListMax,
+            interval: yAxisListMax / 5
+          },
+            {
+              name: 'Response Time',
+              type: 'value',
+              min: 0,
+              max: yAxis2ListMax,
+              interval: yAxis2ListMax / 5
+            }
+          ],
+          series: []
+        }
+        let setting = {
+          series: [
+            {
+              name: 'users',
+              color: '#0CA74A',
+            }
+          ]
+        }
+
+        yAxisIndex0List.forEach(item => {
+          setting["series"].splice(0, 0, {name: item, yAxisIndex: '0'})
+        })
+
+        yAxisIndex1List.forEach(item => {
+          setting["series"].splice(0, 0, {name: item, yAxisIndex: '1'})
+        })
+
+        this.responseTimeList.push(this.generateOption(resOption, data, setting));
+      }).catch(() => {
+        this.responseTimeList = [];
+      })
+    },
+    generateOption(option, data, setting) {
+      let chartData = data;
+      let seriesArray = [];
+      for (let set in setting) {
+        if (set === "series") {
+          seriesArray = setting[set];
+          continue;
+        }
+        this.$set(option, set, setting[set]);
+      }
+      let legend = [], series = {}, xAxis = [], seriesData = [];
+      chartData.forEach(item => {
+        if (!xAxis.includes(item.xAxis)) {
+          xAxis.push(item.xAxis);
+        }
+        xAxis.sort()
+        let name = item.groupName
+        if (!legend.includes(name)) {
+          legend.push(name)
+          series[name] = []
+        }
+        if (item.yAxis === -1) {
+          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis2.toFixed(2)]);
+        } else {
+          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis.toFixed(2)]);
+        }
+      })
+      this.$set(option.legend, "data", legend);
+      this.$set(option.legend, "type", "scroll");
+      this.$set(option.legend, "bottom", "10px");
+      this.$set(option.xAxis, "data", xAxis);
+      for (let name in series) {
+        let d = series[name];
+        d.sort((a, b) => a[0].localeCompare(b[0]));
+        let items = {
+          name: name,
+          type: 'line',
+          data: d,
+          smooth: true
+        };
+        let seriesArrayNames = seriesArray.map(m => m.name);
+        if (seriesArrayNames.includes(name)) {
+          for (let j = 0; j < seriesArray.length; j++) {
+            let seriesObj = seriesArray[j];
+            if (seriesObj['name'] === name) {
+              Object.assign(items, seriesObj);
+            }
+          }
+        }
+        seriesData.push(items);
+      }
+      this.$set(option, "series", seriesData);
+      return option;
+    },
+    _getChartMax(arr) {
+      const max = Math.max(...arr);
+      return Math.ceil(max / 4.5) * 5;
+    },
+    _unique(arr) {
+      return Array.from(new Set(arr));
+    }
+  }
+}
+</script>
+
+<style scoped>
+.echarts {
+  width: 100%;
+  height: 300px;
+}
+</style>
diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
index 6e203f66fb..216ab7d1da 100644
--- a/frontend/src/business/components/performance/report/components/SameTestReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -5,20 +5,23 @@
              :visible.sync="loadReportVisible">
     <el-table v-loading="reportLoadingResult.loading"
               class="basic-config"
-              :data="compareReports"
+              :data="tableData"
               @select-all="handleSelectAll"
               @select="handleSelectionChange">
 
       <el-table-column type="selection"/>
       <el-table-column
-        prop="name"
-        :label="$t('commons.name')"
-        show-overflow-tooltip>
+          prop="name"
+          :label="$t('commons.name')"
+          show-overflow-tooltip>
+        <template v-slot:default="scope">
+          {{ scope.row.name }} <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="userName"
-        :label="$t('report.user_name')"
-        show-overflow-tooltip>
+          prop="userName"
+          :label="$t('report.user_name')"
+          show-overflow-tooltip>
       </el-table-column>
       <el-table-column prop="triggerMode"
                        :label="$t('test_track.report.list.trigger_mode')">
@@ -27,7 +30,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('commons.create_time')">
+          :label="$t('commons.create_time')">
         <template v-slot:default="scope">
           <i class="el-icon-time"/>
           <span class="last-modified">{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -55,46 +58,56 @@ export default {
     return {
       loadReportVisible: false,
       reportLoadingResult: {},
-      compareReports: [],
+      tableData: [],
       currentPage: 1,
       pageSize: 10,
       total: 0,
       selectIds: new Set,
+      report: {},
+      compareReports: [],
     }
   },
   methods: {
     open(report) {
-      this.getCompareReports(report.testId);
+      this.report = report;
+      this.getCompareReports(report);
+
+      this.compareReports.push(report);
+
       this.loadReportVisible = true;
     },
     close() {
       this.loadReportVisible = false;
     },
-    getCompareReports(testId) {
+    getCompareReports(report) {
 
       let condition = {
-        testId: testId,
+        testId: report.testId,
         filters: {status: ["Completed"]}
       };
       this.reportLoadingResult = this.$post('/performance/report/list/all/' + this.currentPage + "/" + this.pageSize, condition, res => {
         let data = res.data;
         this.total = data.itemCount;
-        this.compareReports = data.listObject;
+        this.tableData = data.listObject;
       })
     },
     handleCompare() {
       let reportIds = [...this.selectIds];
-      localStorage.setItem("compareReportIds", JSON.stringify(reportIds));
+      this.tableData
+          .filter(r => reportIds.indexOf(r.id) > -1 && this.report.id !== r.id)
+          .forEach(r => this.compareReports.push(r));
+
+      localStorage.setItem("compareReports", JSON.stringify(this.compareReports));
       this.close();
       this.$router.push({path: '/performance/report/compare/' + reportIds[0]});
     },
     handleSelectAll(selection) {
       if (selection.length > 0) {
-        this.compareReports.forEach(item => {
+        this.tableData.forEach(item => {
           this.selectIds.add(item.id);
         });
       } else {
-        this.compareReports.forEach(item => {
+        this.tableData.forEach(item => {
           if (this.selectIds.has(item.id)) {
             this.selectIds.delete(item.id);
           }

From f29cad3cf09d0698f5f96421fe4a03dcd87c510f Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:05:21 +0800
Subject: [PATCH 13/18] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 07951ba17a..2115bd28a9 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit 2115bd28a90854d2b6276a90878934715498c584

From 34be7ce27f327e8062cd67636a26703f976a4ef1 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:10:00 +0800
Subject: [PATCH 14/18] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94=E5=B0=86?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=8A=A5=E5=91=8A=E7=9A=84=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E5=86=99=E5=9C=A8=E5=90=8D=E7=A7=B0=E5=89=8D=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/components/SameTestReports.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
index 216ab7d1da..ec2b835e73 100644
--- a/frontend/src/business/components/performance/report/components/SameTestReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -15,7 +15,7 @@
           :label="$t('commons.name')"
           show-overflow-tooltip>
         <template v-slot:default="scope">
-          {{ scope.row.name }} <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i>
+          <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i> {{ scope.row.name }}
         </template>
       </el-table-column>
       <el-table-column

From 5ac89f8410a1d5595ebcaa517971204abda8ab7d Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 26 Mar 2021 18:12:25 +0800
Subject: [PATCH 15/18] =?UTF-8?q?fix:=20=E8=A1=A8=E5=A4=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/ApiScenarioList.vue |  1 -
 .../components/list/ApiCaseSimpleList.vue       |  4 ----
 .../api/definition/components/list/ApiList.vue  |  2 --
 .../track/case/components/TestCaseList.vue      |  4 ++--
 .../track/plan/components/TestPlanList.vue      |  2 --
 .../view/comonents/api/TestPlanApiCaseList.vue  |  2 --
 .../comonents/api/TestPlanApiScenarioList.vue   |  2 --
 .../functional/FunctionalTestCaseList.vue       |  1 -
 .../comonents/load/TestPlanLoadCaseList.vue     |  1 -
 .../review/components/TestCaseReviewList.vue    |  1 -
 .../view/components/TestReviewTestCaseList.vue  |  1 -
 frontend/src/common/js/tableUtils.js            | 17 ++++++++---------
 frontend/src/i18n/zh-CN.js                      |  2 +-
 13 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 7334643973..20368c7be4 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -374,7 +374,6 @@
     },
     methods: {
       customHeader() {
-        getLabel(this, API_SCENARIO_LIST);
         this.$refs.headerCustom.open(this.tableLabel)
       },
       selectByParam() {
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 6437c94123..7bb7c2e60a 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -264,11 +264,9 @@ export default {
       this.$nextTick(() => {
         this.$refs.caseTable.bodyWrapper.scrollTop = 5
       })
-      getLabel(this, API_CASE_LIST);
     },
     watch: {
       selectNodeIds() {
-        getLabel(this, API_CASE_LIST);
         this.initTable();
       },
       currentProtocol() {
@@ -294,11 +292,9 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, API_CASE_LIST);
       this.$refs.headerCustom.open(this.tableLabel)
     },
     initTable() {
-      getLabel(this, API_CASE_LIST);
       this.selectRows = new Set();
       this.condition.status = "";
       this.condition.moduleIds = this.selectNodeIds;
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 7ec2982c49..faee8860ce 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -383,7 +383,6 @@
       this.getSystemLabel(this.type)
       this.initTable();
       this.getMaintainerOptions();
-      getLabel(this, API_LIST);
     },
     watch: {
       selectNodeIds() {
@@ -413,7 +412,6 @@
         })
       },
       customHeader() {
-        getLabel(this, API_LIST);
         this.$refs.headerCustom.open(this.tableLabel)
       },
       handleBatchMove() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 8a6220194d..815a6eec64 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -309,7 +309,7 @@ export default {
       this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
     }
     this.initTableData();
-    getSystemLabel(this, this.type)
+
   },
   activated() {
     if (this.trashEnable) {
@@ -330,7 +330,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_CASE_LIST);
       this.$refs.headerCustom.open(this.tableLabel)
     },
     getSelectDataRange() {
@@ -352,6 +351,7 @@ export default {
         this.condition.nodeIds = this.selectNodeIds;
       }
       getLabel(this, TEST_CASE_LIST);
+
       this.getData();
     },
     getData() {
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 7cf1aa7162..b2bd87c542 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -295,7 +295,6 @@ export default {
   },
   methods: {
     inite() {
-      getLabel(this, TEST_PLAN_LIST);
       this.initTableData()
     },
     calPassRate(scope) {
@@ -303,7 +302,6 @@ export default {
       return Number.parseInt(passRate, 10);
     },
     customHeader() {
-      getLabel(this, TEST_PLAN_LIST);
       this.$refs.headerCustom.open(this.tableLabel)
     },
     initTableData() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 4fab18c445..cbb7ebf98a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -304,8 +304,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_PLAN_API_CASE);
-
       this.$refs.headerCustom.open(this.tableLabel)
     },
     getMaintainerOptions() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index f997aba38f..8456d0d8bd 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -201,8 +201,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_PLAN_SCENARIO_CASE);
-
       this.$refs.headerCustom.open(this.tableLabel)
     },
     search() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 5117b039af..7c21e48f3a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -429,7 +429,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE);
       this.$refs.headerCustom.open(this.tableLabel)
     },
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index 7f38eb878a..63e1a4c4df 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -211,7 +211,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_PLAN_LOAD_CASE);
       this.$refs.headerCustom.open(this.tableLabel)
     },
     initTable() {
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 4fb47c4b4a..8131b853a0 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -183,7 +183,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_CASE_REVIEW_LIST);
       this.$refs.headerCustom.open(this.tableLabel)
     },
 
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 93d56b4f63..3d9d3a25c2 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -301,7 +301,6 @@ export default {
   },
   methods: {
     customHeader() {
-      getLabel(this, TEST_CASE_REVIEW_CASE_LIST);
       this.$refs.headerCustom.open(this.tableLabel)
     },
     initTableData() {
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 1980090164..2c7978fd7e 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -114,15 +114,14 @@ export function getLabel(vueObj, type) {
   vueObj.result = vueObj.$post('/system/header/info', param, response => {
     if (response.data != null) {
       vueObj.tableLabel = eval(response.data.props);
-    }
-  })
-}
-export function getSystemLabel(vueObj, type) {
-  let param = {}
-  param.type=type
-  vueObj.result = vueObj.$post('/system/system/header',param, response => {
-    if (response.data != null) {
-      vueObj.tableLabel = eval(response.data.props);
+    }else{
+      let param = {}
+      param.type=type
+      vueObj.result = vueObj.$post('/system/system/header',param, response => {
+        if (response.data != null) {
+          vueObj.tableLabel = eval(response.data.props);
+        }
+      })
     }
   })
 }
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 051d1beade..eeccb8d2a5 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1193,7 +1193,7 @@ export default {
       batch_delete_case: '批量删除',
       batch_unlink: '批量取消关联',
       project_name: '所属项目',
-      status: '评审状态',
+      status: '评审结果',
       status_prepare: '未评审',
       status_pass: '通过',
       status_un_pass: '未通过',

From 1f5fc92233e016961f10903ab93de594922f177f Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:16:43 +0800
Subject: [PATCH 16/18] =?UTF-8?q?Revert=20"refactor(=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95):=20=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E5=B0=86=E5=BD=93=E5=89=8D=E6=8A=A5=E5=91=8A=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=86=99=E5=9C=A8=E5=90=8D=E7=A7=B0=E5=89=8D=E8=BE=B9?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 34be7ce2
---
 .../performance/report/components/SameTestReports.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
index ec2b835e73..216ab7d1da 100644
--- a/frontend/src/business/components/performance/report/components/SameTestReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -15,7 +15,7 @@
           :label="$t('commons.name')"
           show-overflow-tooltip>
         <template v-slot:default="scope">
-          <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i> {{ scope.row.name }}
+          {{ scope.row.name }} <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i>
         </template>
       </el-table-column>
       <el-table-column

From a162fe4f45b0ed67e265e32102c36b0a716f3199 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:16:54 +0800
Subject: [PATCH 17/18] =?UTF-8?q?Revert=20"feat(=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=B9=E6=AF=94"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e26561e4
---
 .../report/PerformanceReportCompare.vue       |  48 +----
 .../report/PerformanceReportView.vue          |   2 -
 .../report/components/LoadCompareCard.vue     | 182 -----------------
 .../report/components/OverviewCompareCard.vue |  67 -------
 .../components/ResponseTimeCompareCard.vue    | 188 ------------------
 .../report/components/SameTestReports.vue     |  45 ++---
 6 files changed, 25 insertions(+), 507 deletions(-)
 delete mode 100644 frontend/src/business/components/performance/report/components/LoadCompareCard.vue
 delete mode 100644 frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
 delete mode 100644 frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue

diff --git a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
index 5e80cfa5e2..3193c0c973 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue
@@ -1,21 +1,9 @@
 <template>
   <ms-container>
     <ms-main-container>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <overview-compare-card ref="overviewCard"/>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <load-compare-card ref="loadCard"/>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <response-time-compare-card ref="responseTimeCard"/>
-        </el-col>
-      </el-row>
+      <el-card>
+
+      </el-card>
     </ms-main-container>
   </ms-container>
 </template>
@@ -24,16 +12,15 @@
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
-import OverviewCompareCard from "@/business/components/performance/report/components/OverviewCompareCard";
-import MsChart from "@/business/components/common/chart/MsChart";
-import LoadCompareCard from "@/business/components/performance/report/components/LoadCompareCard";
-import ResponseTimeCompareCard from "@/business/components/performance/report/components/ResponseTimeCompareCard";
 
 export default {
   name: "PerformanceReportCompare",
-  components: {ResponseTimeCompareCard, LoadCompareCard, MsChart, OverviewCompareCard, MsMainContainer, MsContainer},
+  components: {MsMainContainer, MsContainer},
   mounted() {
-    this.init();
+    let reportId = this.$route.path.split('/')[4];
+    console.log(reportId);
+    let items = localStorage.getItem("compareReportIds");
+    console.log(JSON.parse(items));
   },
   computed: {
     isReadOnly() {
@@ -43,28 +30,11 @@ export default {
   data() {
     return {}
   },
-  methods: {
-    init() {
-      this.$refs.overviewCard.initTable();
-      this.$refs.loadCard.initCard();
-      this.$refs.responseTimeCard.initCard();
-    }
-  },
-  watch: {
-    '$route'(to) {
-      if (to.name !== "ReportCompare") {
-        return;
-      }
+  methods: {}
 
-      this.init();
-    }
-  }
 }
 </script>
 
 <style scoped>
-.el-row {
-  padding-bottom: 20px;
-}
 
 </style>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index d7934bc6b2..c496eb8646 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -332,8 +332,6 @@ export default {
         this.$set(this.report, "id", this.reportId);
         this.$set(this.report, "status", data.status);
         this.$set(this.report, "testId", data.testId);
-        this.$set(this.report, "name", data.name);
-        this.$set(this.report, "createTime", data.createTime);
         this.$set(this.report, "loadConfiguration", data.loadConfiguration);
         this.checkReportStatus(data.status);
         if (this.status === "Completed" || this.status === "Running") {
diff --git a/frontend/src/business/components/performance/report/components/LoadCompareCard.vue b/frontend/src/business/components/performance/report/components/LoadCompareCard.vue
deleted file mode 100644
index 8cba2a523f..0000000000
--- a/frontend/src/business/components/performance/report/components/LoadCompareCard.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <el-card>
-    <template v-slot:header>
-      <span class="title">Load</span>
-    </template>
-    <div v-for="(option, index) in loadList" :key="index">
-      <ms-chart ref="chart1" :options="option" :autoresize="true"></ms-chart>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import MsChart from "@/business/components/common/chart/MsChart";
-
-export default {
-  name: "LoadCompareCard",
-  components: {MsChart},
-  data() {
-    return {
-      loadList: []
-    }
-  },
-  methods: {
-    initCard() {
-      this.loadList = [];
-      this.reportId = this.$route.path.split('/')[4];
-      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
-
-      this.compareReports.forEach(report => {
-        this.initOverview(report);
-      })
-    },
-    initOverview(report) {
-      this.$get("/performance/report/content/load_chart/" + report.id).then(res => {
-        let data = res.data.data;
-        let yAxisList = data.filter(m => m.yAxis2 === -1).map(m => m.yAxis);
-        let yAxis2List = data.filter(m => m.yAxis === -1).map(m => m.yAxis2);
-        let yAxisListMax = this._getChartMax(yAxisList);
-        let yAxis2ListMax = this._getChartMax(yAxis2List);
-
-        let yAxisIndex0List = data.filter(m => m.yAxis2 === -1).map(m => m.groupName);
-        yAxisIndex0List = this._unique(yAxisIndex0List);
-        let yAxisIndex1List = data.filter(m => m.yAxis === -1).map(m => m.groupName);
-        yAxisIndex1List = this._unique(yAxisIndex1List);
-
-        let loadOption = {
-          title: {
-            text: report.name + " " + this.$options.filters['timestampFormatDate'](report.createTime),
-            left: 'center',
-            top: 20,
-            textStyle: {
-              color: '#65A2FF'
-            },
-          },
-          tooltip: {
-            show: true,
-            trigger: 'axis',
-            // extraCssText: 'z-index: 999;',
-            confine: true,
-          },
-          legend: {},
-          xAxis: {},
-          yAxis: [{
-            name: 'User',
-            type: 'value',
-            min: 0,
-            max: yAxisListMax,
-            splitNumber: 5,
-            interval: yAxisListMax / 5
-          },
-            {
-              name: 'Transactions/s',
-              type: 'value',
-              splitNumber: 5,
-              min: 0,
-              max: yAxis2ListMax,
-              interval: yAxis2ListMax / 5
-            }
-          ],
-          series: []
-        };
-        let setting = {
-          series: [
-            {
-              name: 'users',
-              color: '#0CA74A',
-            },
-            {
-              name: 'hits',
-              yAxisIndex: '1',
-              color: '#65A2FF',
-            },
-            {
-              name: 'errors',
-              yAxisIndex: '1',
-              color: '#E6113C',
-            }
-          ]
-        }
-        yAxisIndex0List.forEach(item => {
-          setting["series"].splice(0, 0, {name: item, yAxisIndex: '0'})
-        })
-
-        yAxisIndex1List.forEach(item => {
-          setting["series"].splice(0, 0, {name: item, yAxisIndex: '1'})
-        })
-        this.loadList.push(this.generateOption(loadOption, data, setting));
-      }).catch(() => {
-        this.loadList = [];
-      })
-    },
-    generateOption(option, data, setting) {
-      let chartData = data;
-      let seriesArray = [];
-      for (let set in setting) {
-        if (set === "series") {
-          seriesArray = setting[set];
-          continue;
-        }
-        this.$set(option, set, setting[set]);
-      }
-      let legend = [], series = {}, xAxis = [], seriesData = [];
-      chartData.forEach(item => {
-        if (!xAxis.includes(item.xAxis)) {
-          xAxis.push(item.xAxis);
-        }
-        xAxis.sort()
-        let name = item.groupName
-        if (!legend.includes(name)) {
-          legend.push(name)
-          series[name] = []
-        }
-        if (item.yAxis === -1) {
-          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis2.toFixed(2)]);
-        } else {
-          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis.toFixed(2)]);
-        }
-      })
-      this.$set(option.legend, "data", legend);
-      this.$set(option.legend, "type", "scroll");
-      this.$set(option.legend, "bottom", "10px");
-      this.$set(option.xAxis, "data", xAxis);
-      for (let name in series) {
-        let d = series[name];
-        d.sort((a, b) => a[0].localeCompare(b[0]));
-        let items = {
-          name: name,
-          type: 'line',
-          data: d,
-          smooth: true
-        };
-        let seriesArrayNames = seriesArray.map(m => m.name);
-        if (seriesArrayNames.includes(name)) {
-          for (let j = 0; j < seriesArray.length; j++) {
-            let seriesObj = seriesArray[j];
-            if (seriesObj['name'] === name) {
-              Object.assign(items, seriesObj);
-            }
-          }
-        }
-        seriesData.push(items);
-      }
-      this.$set(option, "series", seriesData);
-      return option;
-    },
-    _getChartMax(arr) {
-      const max = Math.max(...arr);
-      return Math.ceil(max / 4.5) * 5;
-    },
-    _unique(arr) {
-      return Array.from(new Set(arr));
-    }
-  }
-}
-</script>
-
-<style scoped>
-.echarts {
-  width: 100%;
-  height: 300px;
-}
-</style>
diff --git a/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue b/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
deleted file mode 100644
index 18298b9967..0000000000
--- a/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <el-card class="table-card">
-    <template v-slot:header>
-      <span class="title">Overview</span>
-    </template>
-    <el-table border :data="overviewList" class="adjust-table test-content">
-      <el-table-column prop="name" :label="$t('commons.name')"/>
-      <el-table-column prop="createTime" :label="$t('commons.create_time')">
-        <template v-slot:default="scope">
-          <span>{{ scope.row.createTime | timestampFormatDate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="maxUsers" label="Max Users"/>
-      <el-table-column prop="avgTransactions" label="Avg.Transactions"/>
-      <el-table-column prop="errors" label="Errors"/>
-      <el-table-column prop="avgResponseTime" label="Avg.Response Time"/>
-      <el-table-column prop="responseTime90" label="90% Response Time"/>
-      <el-table-column prop="avgBandwidth" label="Avg.Bandwidth"/>
-    </el-table>
-  </el-card>
-</template>
-
-<script>
-export default {
-  name: "OverviewCompareCard",
-  data() {
-    return {
-      reportId: null,
-      compareReports: [],
-      overviewList: [],
-    };
-  },
-  methods: {
-    initTable() {
-      this.overviewList = [];
-
-      this.reportId = this.$route.path.split('/')[4];
-      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
-
-      this.compareReports.forEach(report => {
-        this.initOverview(report);
-      })
-    },
-    initOverview(report) {
-      this.$get("/performance/report/content/testoverview/" + report.id).then(res => {
-        let data = res.data.data;
-        this.overviewList.push({
-          name: report.name,
-          createTime: report.createTime,
-          maxUsers: data.maxUsers,
-          avgThroughput: data.avgThroughput,
-          avgTransactions: data.avgTransactions,
-          errors: data.errors,
-          avgResponseTime: data.avgResponseTime,
-          responseTime90: data.responseTime90,
-          avgBandwidth: data.avgBandwidth,
-        })
-      }).catch(() => {
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue b/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue
deleted file mode 100644
index 1f48b5ea2c..0000000000
--- a/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <el-card>
-    <template v-slot:header>
-      <span class="title">Response Time</span>
-    </template>
-    <div v-for="(option, index) in responseTimeList" :key="index">
-      <ms-chart ref="chart1" :options="option" :autoresize="true"></ms-chart>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import MsChart from "@/business/components/common/chart/MsChart";
-
-export default {
-  name: "ResponseTimeCompareCard",
-  components: {MsChart},
-  data() {
-    return {
-      responseTimeList: []
-    }
-  },
-  methods: {
-    initCard() {
-      this.responseTimeList = [];
-      this.reportId = this.$route.path.split('/')[4];
-      this.compareReports = JSON.parse(localStorage.getItem("compareReports"));
-
-      this.compareReports.forEach(report => {
-        this.initOverview(report);
-      })
-    },
-    initOverview(report) {
-      this.$get("/performance/report/content/res_chart/" + report.id).then(res => {
-        let data = res.data.data;
-        let yAxisList = data.filter(m => m.yAxis2 === -1).map(m => m.yAxis);
-        let yAxis2List = data.filter(m => m.yAxis === -1).map(m => m.yAxis2);
-        let yAxisListMax = this._getChartMax(yAxisList);
-        let yAxis2ListMax = this._getChartMax(yAxis2List);
-
-        let yAxisIndex0List = data.filter(m => m.yAxis2 === -1).map(m => m.groupName);
-        yAxisIndex0List = this._unique(yAxisIndex0List);
-        let yAxisIndex1List = data.filter(m => m.yAxis === -1).map(m => m.groupName);
-        yAxisIndex1List = this._unique(yAxisIndex1List);
-
-        let resOption = {
-          title: {
-            text: report.name + " " + this.$options.filters['timestampFormatDate'](report.createTime),
-            left: 'center',
-            top: 20,
-            textStyle: {
-              color: '#99743C'
-            },
-          },
-          tooltip: {
-            show: true,
-            trigger: 'axis',
-            // extraCssText: 'z-index: 999;',
-            confine: true,
-            formatter: function (params, ticket, callback) {
-              let result = "";
-              let name = params[0].name;
-              result += name + "<br/>";
-              for (let i = 0; i < params.length; i++) {
-                let seriesName = params[i].seriesName;
-                if (seriesName.length > 100) {
-                  seriesName = seriesName.substring(0, 100);
-                }
-                let value = params[i].value;
-                let marker = params[i].marker;
-                result += marker + seriesName + ": " + value[1] + "<br/>";
-              }
-
-              return result;
-            }
-          },
-          legend: {},
-          xAxis: {},
-          yAxis: [{
-            name: 'User',
-            type: 'value',
-            min: 0,
-            max: yAxisListMax,
-            interval: yAxisListMax / 5
-          },
-            {
-              name: 'Response Time',
-              type: 'value',
-              min: 0,
-              max: yAxis2ListMax,
-              interval: yAxis2ListMax / 5
-            }
-          ],
-          series: []
-        }
-        let setting = {
-          series: [
-            {
-              name: 'users',
-              color: '#0CA74A',
-            }
-          ]
-        }
-
-        yAxisIndex0List.forEach(item => {
-          setting["series"].splice(0, 0, {name: item, yAxisIndex: '0'})
-        })
-
-        yAxisIndex1List.forEach(item => {
-          setting["series"].splice(0, 0, {name: item, yAxisIndex: '1'})
-        })
-
-        this.responseTimeList.push(this.generateOption(resOption, data, setting));
-      }).catch(() => {
-        this.responseTimeList = [];
-      })
-    },
-    generateOption(option, data, setting) {
-      let chartData = data;
-      let seriesArray = [];
-      for (let set in setting) {
-        if (set === "series") {
-          seriesArray = setting[set];
-          continue;
-        }
-        this.$set(option, set, setting[set]);
-      }
-      let legend = [], series = {}, xAxis = [], seriesData = [];
-      chartData.forEach(item => {
-        if (!xAxis.includes(item.xAxis)) {
-          xAxis.push(item.xAxis);
-        }
-        xAxis.sort()
-        let name = item.groupName
-        if (!legend.includes(name)) {
-          legend.push(name)
-          series[name] = []
-        }
-        if (item.yAxis === -1) {
-          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis2.toFixed(2)]);
-        } else {
-          series[name].splice(xAxis.indexOf(item.xAxis), 0, [item.xAxis, item.yAxis.toFixed(2)]);
-        }
-      })
-      this.$set(option.legend, "data", legend);
-      this.$set(option.legend, "type", "scroll");
-      this.$set(option.legend, "bottom", "10px");
-      this.$set(option.xAxis, "data", xAxis);
-      for (let name in series) {
-        let d = series[name];
-        d.sort((a, b) => a[0].localeCompare(b[0]));
-        let items = {
-          name: name,
-          type: 'line',
-          data: d,
-          smooth: true
-        };
-        let seriesArrayNames = seriesArray.map(m => m.name);
-        if (seriesArrayNames.includes(name)) {
-          for (let j = 0; j < seriesArray.length; j++) {
-            let seriesObj = seriesArray[j];
-            if (seriesObj['name'] === name) {
-              Object.assign(items, seriesObj);
-            }
-          }
-        }
-        seriesData.push(items);
-      }
-      this.$set(option, "series", seriesData);
-      return option;
-    },
-    _getChartMax(arr) {
-      const max = Math.max(...arr);
-      return Math.ceil(max / 4.5) * 5;
-    },
-    _unique(arr) {
-      return Array.from(new Set(arr));
-    }
-  }
-}
-</script>
-
-<style scoped>
-.echarts {
-  width: 100%;
-  height: 300px;
-}
-</style>
diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue
index 216ab7d1da..6e203f66fb 100644
--- a/frontend/src/business/components/performance/report/components/SameTestReports.vue
+++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue
@@ -5,23 +5,20 @@
              :visible.sync="loadReportVisible">
     <el-table v-loading="reportLoadingResult.loading"
               class="basic-config"
-              :data="tableData"
+              :data="compareReports"
               @select-all="handleSelectAll"
               @select="handleSelectionChange">
 
       <el-table-column type="selection"/>
       <el-table-column
-          prop="name"
-          :label="$t('commons.name')"
-          show-overflow-tooltip>
-        <template v-slot:default="scope">
-          {{ scope.row.name }} <i v-if="scope.row.id === report.id" class="el-icon-star-on"></i>
-        </template>
+        prop="name"
+        :label="$t('commons.name')"
+        show-overflow-tooltip>
       </el-table-column>
       <el-table-column
-          prop="userName"
-          :label="$t('report.user_name')"
-          show-overflow-tooltip>
+        prop="userName"
+        :label="$t('report.user_name')"
+        show-overflow-tooltip>
       </el-table-column>
       <el-table-column prop="triggerMode"
                        :label="$t('test_track.report.list.trigger_mode')">
@@ -30,7 +27,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          :label="$t('commons.create_time')">
+        :label="$t('commons.create_time')">
         <template v-slot:default="scope">
           <i class="el-icon-time"/>
           <span class="last-modified">{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -58,56 +55,46 @@ export default {
     return {
       loadReportVisible: false,
       reportLoadingResult: {},
-      tableData: [],
+      compareReports: [],
       currentPage: 1,
       pageSize: 10,
       total: 0,
       selectIds: new Set,
-      report: {},
-      compareReports: [],
     }
   },
   methods: {
     open(report) {
-      this.report = report;
-      this.getCompareReports(report);
-
-      this.compareReports.push(report);
-
+      this.getCompareReports(report.testId);
       this.loadReportVisible = true;
     },
     close() {
       this.loadReportVisible = false;
     },
-    getCompareReports(report) {
+    getCompareReports(testId) {
 
       let condition = {
-        testId: report.testId,
+        testId: testId,
         filters: {status: ["Completed"]}
       };
       this.reportLoadingResult = this.$post('/performance/report/list/all/' + this.currentPage + "/" + this.pageSize, condition, res => {
         let data = res.data;
         this.total = data.itemCount;
-        this.tableData = data.listObject;
+        this.compareReports = data.listObject;
       })
     },
     handleCompare() {
       let reportIds = [...this.selectIds];
-      this.tableData
-          .filter(r => reportIds.indexOf(r.id) > -1 && this.report.id !== r.id)
-          .forEach(r => this.compareReports.push(r));
-
-      localStorage.setItem("compareReports", JSON.stringify(this.compareReports));
+      localStorage.setItem("compareReportIds", JSON.stringify(reportIds));
       this.close();
       this.$router.push({path: '/performance/report/compare/' + reportIds[0]});
     },
     handleSelectAll(selection) {
       if (selection.length > 0) {
-        this.tableData.forEach(item => {
+        this.compareReports.forEach(item => {
           this.selectIds.add(item.id);
         });
       } else {
-        this.tableData.forEach(item => {
+        this.compareReports.forEach(item => {
           if (this.selectIds.has(item.id)) {
             this.selectIds.delete(item.id);
           }

From 9bfaf7588e5f31ac3fe839ff6080449446564649 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 26 Mar 2021 18:20:18 +0800
Subject: [PATCH 18/18] =?UTF-8?q?Revert=20"feat(=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=B9=E6=AF=94"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/report/PerformanceReportView.vue    | 3 ---
 .../performance/report/PerformanceTestReportList.vue           | 2 --
 2 files changed, 5 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index c496eb8646..9758cddeed 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -25,9 +25,6 @@
               <el-button :disabled="isReadOnly" type="info" plain size="mini" @click="handleExport(reportName)">
                 {{ $t('test_track.plan_view.export_report') }}
               </el-button>
-              <el-button :disabled="isReadOnly || report.status !== 'Completed'" type="default" plain size="mini" @click="compareReports()">
-                {{ $t('report.compare') }}
-              </el-button>
               <el-button :disabled="isReadOnly" type="warning" plain size="mini" @click="downloadJtl()">
                 {{ $t('report.downloadJtl') }}
               </el-button>
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
index d8440fea96..9f5faffcc8 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue
@@ -71,8 +71,6 @@
             <template v-slot:default="scope">
               <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
                                         @exec="handleEdit(scope.row)" type="primary"/>
-              <ms-table-operator-button :tip="$t('load_test.report.diff')" icon="el-icon-s-operation"
-                                        @exec="handleDiff(scope.row)" type="warning"/>
               <ms-table-operator-button :is-tester-permission="true" :tip="$t('api_report.delete')"
                                         icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
             </template>