Merge branch 'dev/v1.1.11_yf' of jianyu/web into feature/v1.1.11

apps/bigmember_pc/src/views/reportDownload/ZhiMaAnalysis.vue

@@ -170,7 +170,7 @@ function onLoadH5() {
         <a
           class="flex items-center justify-center report-download"
           :class="{ 'report-download-disabled': !finished }"
-          :download="downloadUrl ? reportType + '.pdf' : ''"
+          :download="downloadUrl ? reportType + '(' + reportName + ').pdf' : ''"
           :href="downloadUrl ? downloadUrl : 'javascript:void(0);'"
           :target="downloadUrl ? '_blank' : ''"
         >

apps/bigmember_pc/src/views/reportDownload/record.vue

@@ -685,7 +685,16 @@ export default {
               if (v.type === '4') {
                 v.fileName = v.ent
               } else if (v.type === '5' || v.type === '6' || v.type === '7') {
-                v.fileName = this.typeObj[v.type.toString()]
+                let reportName = ''
+                if (v.type === '5') {
+                  reportName = v.projectname
+                } else if (v.type === '6') {
+                  reportName = v.ent
+                } else if (v.type === '7') {
+                  reportName = v.buyer
+                }
+                v.fileName =
+                  this.typeObj[v.type.toString()] + '(' + reportName + ')'
               } else {
                 const typeName = v.type
                   ? this.typeObj[v.type.toString()]

apps/mobile/src/views/report/ZhiMaAnalysis.vue

@@ -111,7 +111,6 @@ export default {
         : '正在生成报告，请稍后...'
     },
     reportLabel() {
-      console.log(reportLabelMap[this.reportMold], 'label')
       return reportLabelMap[this.reportMold] + (this.isExample ? '样例' : '')
     },
     isExample() {
@@ -183,7 +182,7 @@ export default {
     },
     async download() {
       if (!this.finished) return
-      const fileUrl = this.downloadUrl
+      const fileUrl = location.origin + this.downloadUrl
       const { platform, platformOS, appVersion } = this.$env
 
       if (this.$envs.inWxMini) {
@@ -197,7 +196,11 @@ export default {
             duration: 0,
             message: 'loading...'
           })
-          const name = '芝麻信用共建分析报告'
+          const name =
+            reportTypeMap[this.reportMold] +
+              '(' +
+              (this.isExample ? '样例' : this.reportName) +
+              ')' || '芝麻信用共建分析报告'
           const types = 'pdf'
           this.getFileSize(fileUrl, (size) => {
             loading.clear()

apps/mobile/src/views/reportAnalysis/reportDownload.vue

@@ -382,7 +382,11 @@ export default {
         } else if (item.type === '4') {
           defaultName = '投标企业信用报告'
         } else if (item.type === '5') {
-          defaultName = '芝麻共建分析报告'
+          defaultName = `项目分析报告(${item.projectname})`
+        } else if (item.type === '6') {
+          defaultName = `竞争对手分析报告(${item.ent})`
+        } else if (item.type === '7') {
+          defaultName = `采购单位分析报告(${item.buyer})`
         }
         if (newIOSApp) {
           const loading = this.$toast.loading({