From ad697ed8692191b1fdb2ad67f2c69f5c006bf926 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 13 Jun 2022 15:24:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1013989 --user=赵勇 [通用设置]任务中心-状态列表中应按照报告结果情况列出所有状态并保持中英文一致 https://www.tapd.cn/55049933/s/1179854 --- .../api/automation/report/ApiReportList.vue | 12 ++++-------- .../api/automation/report/ApiReportStatus.vue | 2 +- frontend/src/business/components/task/TaskCenter.vue | 10 +++++----- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue index 605020a287..1684557957 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportList.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue @@ -188,16 +188,12 @@ export default { loading: false, currentProjectId: "", statusFilters: [ - {text: 'Saved', value: 'Saved'}, - {text: 'Starting', value: 'Starting'}, {text: 'Running', value: 'Running'}, - {text: 'Reporting', value: 'Reporting'}, - {text: 'Completed', value: 'Completed'}, - {text: 'Error', value: 'Error'}, {text: 'Success', value: 'Success'}, - {text: 'stopped', value: 'stop'}, - {text: 'Unexecute', value: 'unexecute'}, - {text: this.$t('error_report_library.option.name'), value: 'errorReportResult'}, + {text: 'Stopped', value: 'stop'}, + {text: 'NotExecute', value: 'unexecute'}, + {text: 'Error', value: 'Error'}, + {text: "FakeError", value: 'errorReportResult'}, ], reportTypeFilters:[], reportScenarioFilters: [ diff --git a/frontend/src/business/components/api/automation/report/ApiReportStatus.vue b/frontend/src/business/components/api/automation/report/ApiReportStatus.vue index 77c1b718c4..bec150ae33 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportStatus.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportStatus.vue @@ -16,7 +16,7 @@ {{ showStatus(row.status) }} - {{ $t('error_report_library.option.name') }} + FakeError {{ showStatus(row.status) }} diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue index f2df30e5a5..6b5e2d5ab0 100644 --- a/frontend/src/business/components/task/TaskCenter.vue +++ b/frontend/src/business/components/task/TaskCenter.vue @@ -129,7 +129,7 @@ - {{ $t('error_report_library.option.name') }} + FakeError @@ -196,17 +196,17 @@ export default { ], runStatus: [ {id: '', label: this.$t('api_test.definition.document.data_set.all')}, - {id: 'saved', label: 'Saved'}, {id: 'starting', label: 'Starting'}, {id: 'running', label: 'Running'}, {id: 'reporting', label: 'Reporting'}, {id: 'completed', label: 'Completed'}, - {id: 'error', label: 'Error'}, {id: 'success', label: 'Success'}, {id: 'waiting', label: 'Waiting'}, + {id: "errorReportResult", label: 'FakeError'}, + {id: 'unexecute', label: 'NotExecute'}, + {id: 'stop', label: 'Stopped'}, + {id: 'error', label: 'Error'}, {id: 'fail', label: 'Fail'}, - {id: 'unexecute', label: 'Unexecuted'}, - {id: 'stop', label: 'Stopped'} ], condition: {triggerMode: "", executionStatus: ""}, maintainerOptions: [],