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

fix(接口场景): 修复事务控制器执行时耗时为0的缺陷 

--bug=1005428 --user=宋天阳
【事务控制器】测试报告的执行时间是0ms
https://www.tapd.cn/55049933/s/1029374
This commit is contained in:
song-tianyang 2021-07-26 18:23:03 +08:00 committed by fit2-zhao
parent 135ffb7734
commit 61648435e8
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/business/components/api/automation/report/ApiReportDetail.vue
View File

@ -123,7 +123,6 @@ export default {
let key = item.name;
let nodeArray = key.split('^@~@^');
let children = tree;
//运行场景中如果连续将1个场景引入多次，会出现运行结果合并的情况。
//为了解决这种问题，在转hashTree的时候给场景放了个新ID，前台加载解析的时候也要做处理
let scenarioId = "";

32
frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
View File

@ -61,6 +61,8 @@ export default {
failsTreeNodes: [],
totalTime: 0,
isRequestResult: false,
startTime : 99991611737506593,
endTime : 0,
request: {},
isActive: false,
scenarioName: null,
@ -245,10 +247,10 @@ export default {
this.$success(this.$t('schedule.event_success'));
});
},
getTransaction(transRequests, startTime, endTime, resMap) {
getTransaction(transRequests,resMap) {
transRequests.forEach(subItem => {
if (subItem.method === 'Request') {
this.getTransaction(subItem.subRequestResults, startTime, endTime, resMap);
this.getTransaction(subItem.subRequestResults, resMap);
}
this.reqTotal++;
let key = subItem.resourceId;
@ -264,18 +266,18 @@ export default {
} else {
this.reqError++;
}
if (subItem.startTime && Number(subItem.startTime) < startTime) {
startTime = subItem.startTime;
if (subItem.startTime && Number(subItem.startTime) < this.startTime) {
this.startTime = subItem.startTime;
}
if (subItem.endTime && Number(subItem.endTime) > endTime) {
endTime = subItem.endTime;
if (subItem.endTime && Number(subItem.endTime) > this.endTime) {
this.endTime = subItem.endTime;
}
})
},
formatResult(res) {
let resMap = new Map;
let startTime = 99991611737506593;
let endTime = 0;
this.startTime = 99991611737506593;
this.endTime = 0;
this.clearDebug();
if (res && res.scenarios) {
res.scenarios.forEach(item => {
@ -286,7 +288,7 @@ export default {
item.requestResults.forEach(req => {
req.responseResult.console = res.console;
if (req.method === 'Request') {
this.getTransaction(req.subRequestResults, startTime, endTime, resMap);
this.getTransaction(req.subRequestResults, resMap);
} else {
this.reqTotal++;
let key = req.resourceId;
@ -302,19 +304,19 @@ export default {
} else {
this.reqError++;
}
if (req.startTime && Number(req.startTime) < startTime) {
startTime = req.startTime;
if (req.startTime && Number(req.startTime) < this.startTime) {
this.startTime = req.startTime;
}
if (req.endTime && Number(req.endTime) > endTime) {
endTime = req.endTime;
if (req.endTime && Number(req.endTime) > this.endTime) {
this.endTime = req.endTime;
}
}
})
}
})
}
if (startTime < endTime) {
this.totalTime = endTime - startTime + 100;
if (this.startTime < this.endTime) {
this.totalTime = this.endTime - this.startTime + 100;
}
this.debugResult = resMap;
this.setTreeValue(this.fullTreeNodes);