From 4fd588afa5b0db022fe346ccd7fc646d78bd99a1 Mon Sep 17 00:00:00 2001 From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com> Date: Wed, 25 Aug 2021 22:12:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=20(#5703)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: chenjianxing --- .../performance/service/PerformanceTestService.java | 2 +- .../components/track/plan/components/TestPlanList.vue | 2 +- .../comonents/report/detail/TestPlanApiReport.vue | 2 +- .../comonents/report/detail/TestPlanLoadReport.vue | 2 +- .../report/detail/TestPlanReportNavigationBar.vue | 11 ++++++----- frontend/src/common/js/default-table-header.js | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index ae94d09d85..89937a1ee3 100644 --- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -134,7 +134,7 @@ public class PerformanceTestService { record.setJmxContent(new String(bytes, StandardCharsets.UTF_8)); extLoadTestReportMapper.updateJmxContentIfAbsent(record); }); - //delete schedule + //delete scheduleFunctionalCases scheduleService.deleteByResourceId(testId, ScheduleGroup.PERFORMANCE_TEST.name()); // delete load_test diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue index 591c935f8e..4efa4da035 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanList.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue @@ -199,7 +199,7 @@ @exec="openReport(scope.row)"/> - + diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanApiReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanApiReport.vue index 0ec68074d9..145ce1509c 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanApiReport.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanApiReport.vue @@ -10,7 +10,7 @@ - + diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue index 0e07544648..87a091a4aa 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue @@ -11,7 +11,7 @@ - + diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue index c0ada1e486..39d6652516 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue @@ -84,15 +84,11 @@ export default { color: white; } -.hidden { - width: 0px !important; - padding: 0px !important; -} .ms-drawer { padding: 15px; height: 230px !important; - /*min-width: 200px !important;*/ + width: 200px !important; top: calc((100vh - 200px)/3) !important; border: 1px solid #E6E6E6; padding: 10px; @@ -102,6 +98,11 @@ export default { overflow: visible !important; } +.hidden { + width: 0px !important; + padding: 0px !important; +} + .title-item { margin: 15px; } diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js index 03c403484d..7f6ea8e44c 100644 --- a/frontend/src/common/js/default-table-header.js +++ b/frontend/src/common/js/default-table-header.js @@ -58,7 +58,7 @@ export let CUSTOM_TABLE_HEADER = { {id: 'tags', key: '7', label: 'commons.tag'}, {id: 'createUser', key: '8', label: 'api_test.creator'}, {id: 'updateTime', key: '9', label: 'api_test.definition.api_last_time'}, - {id: 'createTime', key: '10', label: 'commons.create_time'}, + {id: 'createTime', key: 'a', label: 'commons.create_time'}, ], //场景测试 API_SCENARIO: [ @@ -140,9 +140,9 @@ export let CUSTOM_TABLE_HEADER = { {id: 'tags', key: '7', label: 'commons.tag'}, {id: 'execResult', key: '8', label: 'test_track.plan.execute_result'}, {id: 'maintainer', key: '9', label: 'api_test.definition.request.responsible'}, - {id: 'environmentName', key: '10', label: 'commons.environment'}, {id: 'updateTime', key: 'a', label: 'api_test.automation.update_time'}, {id: 'createTime', key: 'b', label: 'commons.create_time'}, + {id: 'environmentName', key: 'c', label: 'commons.environment'}, ], //测试计划-性能用例 TEST_PLAN_LOAD_CASE: [ @@ -162,13 +162,13 @@ export let CUSTOM_TABLE_HEADER = { {id: 'level', key: '3', label: 'api_test.automation.case_level'}, {id: 'tagNames', key: '4', label: 'api_test.automation.tag'}, {id: 'stepTotal', key: '7', label: 'api_test.automation.step'}, - {id: 'lastResult', key: '10', label: 'api_test.automation.last_result'}, {id: 'envs', key: '8', label: 'commons.environment'}, {id: 'passRate', key: '9', label: 'api_test.automation.passing_rate'}, {id: 'maintainer', key: 'a', label: 'api_test.definition.request.responsible'}, {id: 'createUser', key: '5', label: 'api_test.automation.creator'}, {id: 'updateTime', key: '6', label: 'api_test.automation.update_time'}, {id: 'createTime', key: 'b', label: 'commons.create_time'}, + {id: 'lastResult', key: 'c', label: 'api_test.automation.last_result'}, ], //测试用例 TRACK_TEST_CASE: [