root/pgserver3.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no commit message

Browse Source
This commit is contained in:
annnj-company
2026-04-27 14:54:37 +08:00
parent e9a1a14c39
commit a17d956d46
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pgserver/application/admin/controller/ReportManage.php
View File

@@ -2750,9 +2750,12 @@ class ReportManage extends Base{
$report_info = Db::name('report')->where('id', $postData['reportid'])->find(); $report_info = Db::name('report')->where('id', $postData['reportid'])->find();
if(empty($report_info)) return $this->buildFailed('报告不存在'); if(empty($report_info)) return $this->buildFailed('报告不存在');
if (empty($report_info['report_url'])) {
if (!$this->produceReport($report_info['id'], $report_info['cur_tmpl_id'])) { if (!$this->produceReport($report_info['id'], $report_info['cur_tmpl_id'])) {
return $this->buildFailed('报告制作失败'); return $this->buildFailed('报告制作失败');
} }
}
$url = Db::name('report')->where('id', $postData['reportid'])->value('report_url'); $url = Db::name('report')->where('id', $postData['reportid'])->value('report_url');
return $this->buildSuccess(['url' => $url]); return $this->buildSuccess(['url' => $url]);

2
pgweb/src/views/report/components/baseInfo.vue
View File

@@ -2683,7 +2683,7 @@ export default {
subFinish(this.topInfo).then(res => { subFinish(this.topInfo).then(res => {
// this.finishLoad = false // this.finishLoad = false
if (res.code === 1) { if (res.code === 1) {
this.reqPreviewReport() // this.reqPreviewReport()
this.$Message.success(res.msg) this.$Message.success(res.msg)
closeCurrentPage(this, this.$route.query.from, {}, this.$route) // 关闭当前页 closeCurrentPage(this, this.$route.query.from, {}, this.$route) // 关闭当前页
} else { } else {