From 2ac559519a4b30bed6d91ba4a436881f759b6cb3 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 1 Jun 2020 18:06:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=80=E8=BF=91=E6=8A=A5=E5=91=8A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/head/PerformanceHeaderMenus.vue   |  1 +
 .../performance/test/PerformanceTestPlan.vue      | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 1b0663f6cd..d0b162a20b 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -91,6 +91,7 @@
         reportRecent: {
           title: this.$t('report.recent'),
           url: "/performance/report/recent/5",
+          showTime: true,
           index(item) {
             return '/performance/report/view/' + item.id;
           },
diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
index 416b515894..ff9bece416 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
@@ -61,6 +61,8 @@
           </el-table-column>
           <el-table-column
             prop="status"
+            :filter-method="filter"
+            :filters="statusFilters"
             :label="$t('commons.status')">
             <template v-slot:default="{row}">
               <ms-performance-test-status :row="row"/>
@@ -88,7 +90,7 @@
   import MsMainContainer from "../../common/components/MsMainContainer";
   import MsPerformanceTestStatus from "./PerformanceTestStatus";
   import MsTableOperators from "../../common/components/MsTableOperators";
-  import {_sort} from "../../../../common/js/utils";
+  import {_filter, _sort} from "../../../../common/js/utils";
 
   export default {
     components: {
@@ -124,6 +126,14 @@
             tip: this.$t('commons.delete'), icon: "el-icon-delete", type: "danger",
             exec: this.handleDelete
           }
+        ],
+        statusFilters: [
+          {text: 'Saved', value: 'Saved'},
+          {text: 'Starting', value: 'Starting'},
+          {text: 'Running', value: 'Running'},
+          {text: 'Reporting', value: 'Reporting'},
+          {text: 'Completed', value: 'Completed'},
+          {text: 'Error', value: 'Error'}
         ]
       }
     },
@@ -194,6 +204,9 @@
       //   _sort(column, this.condition);
       //   this.initTableData();
       // },
+      filter(value, row) {
+        return row.status === value;
+      },
       link(row) {
         this.$router.push({
           path: '/performance/test/edit/' + row.id,

From 32b77b5e2f66a5083e45110b0e112ca2d9bb5349 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 1 Jun 2020 18:13:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AD=9B=E9=80=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/PerformanceTestReport.vue          | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index a36bbacbd3..47691511eb 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -16,7 +16,9 @@
           </div>
         </template>
 
-        <el-table :data="tableData" class="test-content">
+        <el-table :data="tableData" class="test-content"
+                  :default-sort="{prop: 'createTime', order: 'descending'}"
+        >
           <el-table-column
             prop="name"
             :label="$t('commons.name')"
@@ -36,21 +38,25 @@
             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>
             </template>
           </el-table-column>
-          <el-table-column
-            width="250"
-            :label="$t('commons.update_time')">
-            <template v-slot:default="scope">
-              <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            width="250"-->
+<!--            :label="$t('commons.update_time')">-->
+<!--            <template v-slot:default="scope">-->
+<!--              <span>{{ scope.row.updateTime | timestampFormatDate }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column
             prop="status"
+            :filter-method="filter"
+            :filters="statusFilters"
             :label="$t('commons.status')">
             <template v-slot:default="{row}">
               <ms-performance-report-status :row="row"/>
@@ -98,6 +104,13 @@
         total: 0,
         loading: false,
         testId: null,
+        statusFilters: [
+          {text: 'Starting', value: 'Starting'},
+          {text: 'Running', value: 'Running'},
+          {text: 'Reporting', value: 'Reporting'},
+          {text: 'Completed', value: 'Completed'},
+          {text: 'Error', value: 'Error'}
+        ]
       }
     },
     methods: {
@@ -148,6 +161,9 @@
           this.initTableData();
         });
       },
+      filter(value, row) {
+        return row.status === value;
+      },
     }
   }
 </script>