Merge remote-tracking branch 'origin/master'

test-test/src/main/java/com/test/test/service/impl/PerformanceTestCaseReportServiceImpl.java

@@ -167,7 +167,7 @@ public class PerformanceTestCaseReportServiceImpl implements IPerformanceTestCas
         JmeterRequest jmeterRequest = new JmeterRequest();
         jmeterRequest.setTestCaseName(testCaseStep.getName());
         jmeterRequest.setUrl(url);
-        jmeterRequest.setPort(testCaseStep.getApiPort());
+        jmeterRequest.setPort(testCaseStep.getApiPort() == null ? 80 : testCaseStep.getApiPort());
         jmeterRequest.setMethod(testCaseStep.getRequestMethod());
         jmeterRequest.setRequestBody(testCaseStep.getRequestBody());
         jmeterRequest.setRequestParams(testCaseStep.getRequestParams());

test-ui/src/router/index.js

@@ -173,7 +173,7 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/performance/report/detail',
+    path: '/performance/report/detail/:id',
     component: Layout,
     hidden: true,
     children: [

test-ui/src/views/test/performance/report.vue

@@ -65,7 +65,7 @@ export default {
   methods: {
     // 查看
     hadleClickDetail(val) {
-      this.$tab.openPage("报告详情", "/performance/report/detail", { id: val.id });
+      this.$tab.openPage(`报告详情_${val.id}`, `/performance/report/detail/${val.id}`, { id: val.id });
     },
     // 删除
     hadleClickDelete(val) {