Merge branch 'requirements_195'

src/views/report_manage/reportdtl.vue

@@ -87,9 +87,10 @@
 					}
 					
 					if(this.$route.query.fromPage == 'en'){
-						str=`${baseUrl}/reportshare_crm_report_en?code=${this.$route.query.code}&flag=${waterMarkStr}`
+						// 加 & 是防止影响到上一个参数
+						str=`${baseUrl}/reportshare_crm_report_en?code=${this.$route.query.code}&flag=${waterMarkStr}& ${this.reportInfo.Title}`
 					}else{
-						str=`${baseUrl}/reportshare_crm_report?code=${this.$route.query.code}&flag=${waterMarkStr}`
+						str=`${baseUrl}/reportshare_crm_report?code=${this.$route.query.code}&flag=${waterMarkStr}& ${this.reportInfo.Title}`
 					}
 				}
 				

src/views/smartReport/reportDetail.vue

@@ -90,7 +90,8 @@ export default {
 			let str=''
 			const baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 			if(this.$route.query.code){
-				str=`${baseUrl}/reportshare_smart_report?code=${this.$route.query.code}`
+                // 加 & 是防止影响到上一个参数
+				str=`${baseUrl}/reportshare_smart_report?code=${this.$route.query.code}& ${this.reportInfo && this.reportInfo.Title}`
 			}
 			return str
 		},