From a17d956d46a436f5e47123cb977bab71b81a6361 Mon Sep 17 00:00:00 2001 From: annnj-company <380904787@qq.com> Date: Mon, 27 Apr 2026 14:54:37 +0800 Subject: [PATCH] no commit message --- pgserver/application/admin/controller/ReportManage.php | 7 +++++-- pgweb/src/views/report/components/baseInfo.vue | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pgserver/application/admin/controller/ReportManage.php b/pgserver/application/admin/controller/ReportManage.php index c7f9d03..05f16bf 100644 --- a/pgserver/application/admin/controller/ReportManage.php +++ b/pgserver/application/admin/controller/ReportManage.php @@ -2750,9 +2750,12 @@ class ReportManage extends Base{ $report_info = Db::name('report')->where('id', $postData['reportid'])->find(); if(empty($report_info)) return $this->buildFailed('报告不存在'); - if (!$this->produceReport($report_info['id'], $report_info['cur_tmpl_id'])) { - return $this->buildFailed('报告制作失败'); + if (empty($report_info['report_url'])) { + if (!$this->produceReport($report_info['id'], $report_info['cur_tmpl_id'])) { + return $this->buildFailed('报告制作失败'); + } } + $url = Db::name('report')->where('id', $postData['reportid'])->value('report_url'); return $this->buildSuccess(['url' => $url]); diff --git a/pgweb/src/views/report/components/baseInfo.vue b/pgweb/src/views/report/components/baseInfo.vue index 38a6d85..15f186f 100644 --- a/pgweb/src/views/report/components/baseInfo.vue +++ b/pgweb/src/views/report/components/baseInfo.vue @@ -2683,7 +2683,7 @@ export default { subFinish(this.topInfo).then(res => { // this.finishLoad = false if (res.code === 1) { - this.reqPreviewReport() + // this.reqPreviewReport() this.$Message.success(res.msg) closeCurrentPage(this, this.$route.query.from, {}, this.$route) // 关闭当前页 } else {