From 063726b5ccf72f1b996c7dab16f29f93bf0b5467 Mon Sep 17 00:00:00 2001
From: chenfanghang <20001117@qq.com>
Date: Mon, 7 Dec 2020 14:28:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7):=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8C=89=E5=AD=97=E6=AF=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ApiDataViewMapper.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiDataViewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiDataViewMapper.xml
index 671a97fdb5..fe6d86d421 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiDataViewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDataViewMapper.xml
@@ -15,7 +15,7 @@
     </delete>
 
     <select id="selectAll" resultType="io.metersphere.api.dto.ApiMonitorSearch">
-        select distinct url from api_data_view;
+        select distinct url from api_data_view order by url;
     </select>
 
     <select id="selectResponseTimeByUrl" parameterType="java.lang.String"
@@ -56,7 +56,7 @@
     </select>
 
     <select id="selectReportIdByUrlAndStartTime" resultType="java.lang.String">
-        select report_id from api_data_view where response_code != 200 and url=#{apiUrl} and start_time=#{startTime};
+        select report_id from api_data_view where url=#{apiUrl} and start_time=#{startTime};
     </select>
 
     <insert id="insertListApiData" parameterType="java.util.List">

From a590e93b89590a3b48352e786ce8eeb472de9313 Mon Sep 17 00:00:00 2001
From: chenfanghang <20001117@qq.com>
Date: Mon, 7 Dec 2020 14:29:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7):http=E7=8A=B6=E6=80=81=E7=A0=81=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E5=8F=AF=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=9B=B8=E5=BA=94=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ApiErrorMonitorChart.vue       | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/monitor/components/ApiErrorMonitorChart.vue b/frontend/src/business/components/api/monitor/components/ApiErrorMonitorChart.vue
index ca7903e471..f5847b5f71 100644
--- a/frontend/src/business/components/api/monitor/components/ApiErrorMonitorChart.vue
+++ b/frontend/src/business/components/api/monitor/components/ApiErrorMonitorChart.vue
@@ -2,7 +2,7 @@
   <common-monitor-chart>
     <template>
       <div id="response-time-chart" :style="{ width:'100%',height:'100%' }">
-        <chart :options="getOptions()" :style="{ width:'100%' }"></chart>
+        <chart :options="getOptions()" :style="{ width:'100%' }" v-on:click="click"></chart>
       </div>
     </template>
   </common-monitor-chart>
@@ -27,20 +27,15 @@ export default {
   },
   methods: {
     click(params) {
-      //如果状态不是以2开头
-      if (params.value.substr(0, 1) !== '2') {
-        let startTime = params.name;
-        this.result = this.$$get('/api/monitor/getReportId', {'startTime': startTime}, {
-          'apiUrl': this.apiUrl
-        }, response => {
-          this.reportId = response.data;
-          let reportId = this.reportId
-          let url = '#/api/report/view/' + reportId;
-          let target = '_blank';
-          window.open(url, target);
-        });
-      }
-
+      let startTime = params.name;
+      this.result = this.$$get('/api/monitor/getReportId', {'startTime': startTime}, {
+        'apiUrl': this.apiUrl
+      }, response => {
+        this.reportId = response.data;
+        let reportId = this.reportId
+        let url = '#/api/report/view/' + reportId;
+        window.open(url, '_blank');
+      });
     },
     getOptions() {
       return {