diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue index e302716787..d3d4956a6a 100644 --- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue +++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue @@ -2,17 +2,13 @@ - - - diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue index dfa97880fd..3222ea2995 100644 --- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue +++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue @@ -1,11 +1,26 @@ - - - - + + + + + + + + + + + + + + {{ $t('commons.confirm') }} + + + + + @@ -82,18 +97,19 @@ :label="$t('error_report_library.use_error_report')" prop="status"> - {{$t('error_report_library.use_desc')}} + {{ $t('error_report_library.use_desc') }} - + - - - - - + + + + + @@ -112,7 +128,7 @@ import MsEnvironmentCommonConfig from "./EnvironmentCommonConfig"; import MsEnvironmentSSLConfig from "./EnvironmentSSLConfig"; import MsApiAuthConfig from "@/business/components/api/definition/components/auth/ApiAuthConfig"; import MsTcpConfig from "@/business/components/api/test/components/request/tcp/TcpConfig"; -import {getUUID,hasLicense} from "@/common/js/utils"; +import {getUUID, hasLicense} from "@/common/js/utils"; import Jsr233ProcessorContent from "@/business/components/api/automation/scenario/common/Jsr233ProcessorContent"; import {createComponent} from "@/business/components/api/definition/components/jmeter/components"; import EnvironmentGlobalScript from "@/business/components/api/test/components/environment/EnvironmentGlobalScript"; @@ -192,12 +208,12 @@ export default { } if (!this.environment.config.assertions) { this.environment.config.assertions = { - duration:{duration:0}, - regex:[], - jsonPath:[], - xpath2:[], - jsr223:[], - document:{type:"json",data:{json:[],xml:[]}}, + duration: {duration: 0}, + regex: [], + jsonPath: [], + xpath2: [], + jsr223: [], + document: {type: "json", data: {json: [], xml: []}}, }; } }, @@ -241,12 +257,12 @@ export default { } if (!this.environment.config.assertions) { this.environment.config.assertions = { - duration:{duration:0}, - regex:[], - jsonPath:[], - xpath2:[], - jsr223:[], - document:{type:"json",data:{json:[],xml:[]}}, + duration: {duration: 0}, + regex: [], + jsonPath: [], + xpath2: [], + jsr223: [], + document: {type: "json", data: {json: [], xml: []}}, }; } @@ -258,8 +274,8 @@ export default { } }, computed: { - hasLicense(){ - let license= hasLicense(); + hasLicense() { + let license = hasLicense(); return license; }, }, @@ -380,6 +396,9 @@ export default { cancel() { this.$emit('close'); }, + confirm() { + this.$emit("confirm"); + }, clearValidate() { this.$refs["environment"].clearValidate(); }, diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue index 011534c0ce..a7dfaf3eb3 100644 --- a/frontend/src/business/components/common/components/MsDialogHeader.vue +++ b/frontend/src/business/components/common/components/MsDialogHeader.vue @@ -1,9 +1,9 @@ - {{title}} + {{ title }} - + @@ -30,6 +30,7 @@ export default { return 'small'; } }, + hideButton: Boolean, enableCancel: Boolean }, methods: { @@ -44,11 +45,12 @@ export default { diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue index aff1cda7f7..8e43c3a48b 100644 --- a/frontend/src/business/components/project/menu/EnvironmentList.vue +++ b/frontend/src/business/components/project/menu/EnvironmentList.vue @@ -59,7 +59,7 @@ - diff --git a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue index d63a68de88..def3c69474 100644 --- a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue +++ b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue @@ -52,12 +52,18 @@ {{ $t('report.test_start_time') }}:{{ startTime | timestampFormatDate }} + + {{ $t('report.test_start_time') }}:{{ planReportTemplate.startTime | timestampFormatDate }} + {{ $t('report.test_start_time') }}:- {{ $t('report.test_end_time') }}:{{ endTime | timestampFormatDate }} + + {{ $t('report.test_end_time') }}:{{ planReportTemplate.endTime | timestampFormatDate }} + {{ $t('report.test_end_time') }}:- diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue index 3ea088e1a7..a175925bef 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue @@ -128,8 +128,10 @@ export default { if (this.isShare) { config.url = '/share' + config.url; } - this.result = this.$download(config, this.report.name + '.html'); - } + this.result = this.$download(config, this.report.name + '.html',()=>{ + this.$success(this.$t("organization.integration.successful_operation")); + }); + }, } }