test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.5' into master

This commit is contained in:
BugKing 2020-12-08 17:05:11 +08:00
parent dd39bb3399 22fd0b1392
commit 7a0004cb5a
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/base/mapper/ApiDataViewMapper.xml
View File

@ -15,7 +15,7 @@
</delete> </delete>
<select id="selectAll" resultType="io.metersphere.api.dto.ApiMonitorSearch"> <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>
<select id="selectResponseTimeByUrl" parameterType="java.lang.String" <select id="selectResponseTimeByUrl" parameterType="java.lang.String"
@ -56,7 +56,7 @@
</select> </select>
<select id="selectReportIdByUrlAndStartTime" resultType="java.lang.String"> <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> </select>
<insert id="insertListApiData" parameterType="java.util.List"> <insert id="insertListApiData" parameterType="java.util.List">

25
frontend/src/business/components/api/monitor/components/ApiErrorMonitorChart.vue
View File

@ -2,7 +2,7 @@
<common-monitor-chart> <common-monitor-chart>
<template> <template>
<div id="response-time-chart" :style="{ width:'100%',height:'100%' }"> <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> </div>
</template> </template>
</common-monitor-chart> </common-monitor-chart>
@ -27,20 +27,15 @@ export default {
}, },
methods: { methods: {
click(params) { click(params) {
//如果状态不是以2开头 let startTime = params.name;
if (params.value.substr(0, 1) !== '2') { this.result = this.$$get('/api/monitor/getReportId', {'startTime': startTime}, {
let startTime = params.name; 'apiUrl': this.apiUrl
this.result = this.$$get('/api/monitor/getReportId', {'startTime': startTime}, { }, response => {
'apiUrl': this.apiUrl this.reportId = response.data;
}, response => { let reportId = this.reportId
this.reportId = response.data; let url = '#/api/report/view/' + reportId;
let reportId = this.reportId window.open(url, '_blank');
let url = '#/api/report/view/' + reportId; });
let target = '_blank';
window.open(url, target);
});
}
}, },
getOptions() { getOptions() {
return { return {