From 4439b17ae08b41dc84ecfbfbb71270a1b840ecfa Mon Sep 17 00:00:00 2001 From: CaptainB Date: Thu, 18 Nov 2021 19:02:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/PerformanceReportView.vue | 15 +- .../components/PerformancePressureConfig.vue | 695 ------------------ .../report/components/TestConfiguration.vue | 30 + .../components/PerformanceAdvancedConfig.vue | 101 ++- .../components/PerformancePressureConfig.vue | 93 +-- .../comonents/load/LoadCaseReportView.vue | 15 +- 6 files changed, 144 insertions(+), 805 deletions(-) delete mode 100644 frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue create mode 100644 frontend/src/business/components/performance/report/components/TestConfiguration.vue diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue index fa4728663e..585cbaa5a3 100644 --- a/frontend/src/business/components/performance/report/PerformanceReportView.vue +++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue @@ -82,9 +82,6 @@
- - - @@ -103,6 +100,9 @@ + + +
@@ -131,7 +131,6 @@ import MsReportLogDetails from './components/LogDetails'; import MsReportRequestStatistics from './components/RequestStatistics'; import MsReportTestDetails from './components/TestDetails'; import MsReportTestOverview from './components/TestOverview'; -import MsPerformancePressureConfig from "./components/PerformancePressureConfig"; import MsContainer from "../../common/components/MsContainer"; import MsMainContainer from "../../common/components/MsMainContainer"; @@ -141,11 +140,13 @@ import MsPerformanceReportExport from "./PerformanceReportExport"; import {Message} from "element-ui"; import SameTestReports from "@/business/components/performance/report/components/SameTestReports"; import MonitorCard from "@/business/components/performance/report/components/MonitorCard"; +import MsTestConfiguration from "@/business/components/performance/report/components/TestConfiguration"; export default { name: "PerformanceReportView", components: { + MsTestConfiguration, MonitorCard, SameTestReports, MsPerformanceReportExport, @@ -156,7 +157,6 @@ export default { MsContainer, MsMainContainer, MsReportTestDetails, - MsPerformancePressureConfig }, props: { perReportId: String @@ -164,7 +164,7 @@ export default { data() { return { result: {}, - active: '1', + active: '0', reportId: '', status: '', reportName: '', @@ -182,7 +182,7 @@ export default { websocket: null, dialogFormVisible: false, reportExportVisible: false, - testPlan: {testResourcePoolId: null}, + test: {testResourcePoolId: null}, refreshTime: localStorage.getItem("reportRefreshTime") || "10", refreshTimes: [ {value: '1', label: '1s'}, @@ -414,6 +414,7 @@ export default { if (data) { this.status = data.status; this.$set(this, "report", data); + this.$set(this.test, "testResourcePoolId", data.testResourcePoolId); this.checkReportStatus(data.status); if (this.status === "Completed" || this.status === "Running") { this.initReportTimeInfo(); diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue deleted file mode 100644 index 7700a14516..0000000000 --- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - diff --git a/frontend/src/business/components/performance/report/components/TestConfiguration.vue b/frontend/src/business/components/performance/report/components/TestConfiguration.vue new file mode 100644 index 0000000000..31bdf7a160 --- /dev/null +++ b/frontend/src/business/components/performance/report/components/TestConfiguration.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue index 8d26d90756..3f928f89d8 100644 --- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue +++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue @@ -3,13 +3,13 @@ - +
{{ $t('load_test.connect_timeout') }}
@@ -19,13 +19,13 @@
- +
{{ $t('load_test.response_timeout') }}
@@ -35,7 +35,7 @@
- +
{{ $t('load_test.granularity') }} @@ -65,13 +65,13 @@ - +
{{ $t('load_test.custom_http_code') }}
@@ -83,7 +83,9 @@

{{ $t('load_test.domain_bind') }}

- + {{ $t('commons.add') }}
@@ -98,7 +100,7 @@