no commit message

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 (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]);

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 {