From b9d48bd00e6e3a4f47dd597cc45b34b43f9a7071 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 31 Jul 2020 15:45:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=9C=80=E8=BF=91=E6=8A=A5=E5=91=8A=E4=B8=AD=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=8A=A5=E5=91=8A=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/report/ApiReportView.vue | 23 +++++++----- .../report/PerformanceReportView.vue | 37 +++++++++++-------- frontend/src/i18n/en-US.js | 2 + frontend/src/i18n/zh-CN.js | 2 + frontend/src/i18n/zh-TW.js | 2 + 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue index d1f4323b5e..5b471a53e5 100644 --- a/frontend/src/business/components/api/report/ApiReportView.vue +++ b/frontend/src/business/components/api/report/ApiReportView.vue @@ -62,17 +62,22 @@ export default { let url = "/api/report/get/" + this.reportId; this.$get(url, response => { this.report = response.data || {}; - if (this.isNotRunning) { - try { - this.content = JSON.parse(this.report.content); - } catch (e) { - console.log(this.report.content) - throw e; + if (response.data) { + if (this.isNotRunning) { + try { + this.content = JSON.parse(this.report.content); + } catch (e) { + console.log(this.report.content) + throw e; + } + this.getFails(); + this.loading = false; + } else { + setTimeout(this.getReport, 2000) } - this.getFails(); - this.loading = false; } else { - setTimeout(this.getReport, 2000) + this.loading = false; + this.$error(this.$t('api_report.not_exist')); } }); } diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue index e2cab7ec1e..d9c40394f9 100644 --- a/frontend/src/business/components/performance/report/PerformanceReportView.vue +++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue @@ -43,12 +43,12 @@ - + - + @@ -63,8 +63,8 @@ -

-

+

+

{{$t('report.force_stop_btn')}} @@ -190,7 +190,7 @@ } else { this.report.status = 'Completed'; } - }) + }); this.dialogFormVisible = false; }, rerun(testId) { @@ -201,7 +201,7 @@ }).then(() => { this.result = this.$post('/performance/run', {id: testId, triggerMode: 'MANUAL'}, (response) => { this.reportId = response.data; - this.$router.push({path: '/performance/report/view/' + this.reportId}) + this.$router.push({path: '/performance/report/view/' + this.reportId}); // 注册 socket this.initWebSocket(); }) @@ -235,16 +235,21 @@ this.reportId = this.$route.path.split('/')[4]; this.result = this.$get("/performance/report/" + this.reportId, res => { let data = res.data; - this.status = data.status; - this.$set(this.report, "id", this.reportId); - this.$set(this.report, "status", data.status); - this.checkReportStatus(data.status); - if (this.status === "Completed" || this.status === "Running") { - this.initReportTimeInfo(); + if (data) { + this.status = data.status; + this.$set(this.report, "id", this.reportId); + this.$set(this.report, "status", data.status); + this.checkReportStatus(data.status); + if (this.status === "Completed" || this.status === "Running") { + this.initReportTimeInfo(); + } + this.initBreadcrumb(); + this.initWebSocket(); + } else { + this.$error(this.$t('report.not_exist')) } - }) - this.initBreadcrumb(); - this.initWebSocket(); + }); + }, beforeDestroy() { this.websocket.close() //离开路由之后断开websocket连接 @@ -288,6 +293,8 @@ } else { this.clearData(); } + } else { + this.$error(this.$t('report.not_exist')); } }); diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 9a6a16ebab..cbe8a4d3b6 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -266,6 +266,7 @@ export default { stop_tips: 'A Graceful shutdown will archive the JTL files and then stop the servers.', force_stop_btn: 'Terminating', stop_btn: 'Graceful shutdown', + not_exist: "Test report does not exist", }, load_test: { operating: 'Operating', @@ -476,6 +477,7 @@ export default { detail: "Report detail", delete: "Delete report", running: "The test is running", + not_exist: "Test report does not exist", }, test_track: { test_track: "Track", diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index cace501b08..5845feb4ad 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -264,6 +264,7 @@ export default { stop_tips: '停止测试会结束当前测试并保留报告数据', force_stop_btn: '强制停止', stop_btn: '停止', + not_exist: "测试报告不存在", }, load_test: { operating: '操作', @@ -475,6 +476,7 @@ export default { detail: "报告详情", delete: "删除报告", running: "测试执行中", + not_exist: "测试报告不存在", }, test_track: { test_track: "测试跟踪", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 2edc62f4c0..1560b895ac 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -264,6 +264,7 @@ export default { stop_tips: '停止測試會結束當前測試並保留報告數據', force_stop_btn: '強制停止', stop_btn: '停止', + not_exist: "測試報告不存在", }, load_test: { operating: '操作', @@ -475,6 +476,7 @@ export default { detail: "報告詳情", delete: "刪除報告", running: "測試執行中", + not_exist: "測試報告不存在", }, test_track: { test_track: "測試跟踪",