Merge branch 'eta2.3.9' into debug

src/views/reportEn/detail.vue

@@ -248,7 +248,8 @@ export default {
     
         localStorage.setItem('waterMarkStr',this.$route.query.flag||'')
         const temwaterMarkStr=this.$route.query.flag||localStorage.getItem('waterMarkStr')
-        const waterMarkStr=Base64.decode(temwaterMarkStr)
+        let waterMarkStr=Base64.decode(temwaterMarkStr)
+        waterMarkStr=decodeURIComponent(waterMarkStr)
         this.$nextTick(()=>{
           if(Data.WatermarkReport==='true'){
             this.setWaterMark(waterMarkStr)

src/views/reportEn/detailPdf.vue

@@ -136,15 +136,15 @@ export default {
         this.reportInfo.Content=this.setReportContent(this.reportInfo.Content)
         this.isshow = true;
 
-        localStorage.setItem('waterMarkStr',this.$route.query.flag||'')
-        const temwaterMarkStr=this.$route.query.flag||localStorage.getItem('waterMarkStr')
-        const waterMarkStr=decodeURIComponent(Base64.decode(temwaterMarkStr))
-        this.$nextTick(()=>{
-          if(Data.WatermarkReport==='true'){
-            this.setWaterMark(waterMarkStr)
-          }
-          this.setBlindWaterMark(waterMarkStr)
-        })
+        // localStorage.setItem('waterMarkStr',this.$route.query.flag||'')
+        // const temwaterMarkStr=this.$route.query.flag||localStorage.getItem('waterMarkStr')
+        // const waterMarkStr=decodeURIComponent(Base64.decode(temwaterMarkStr))
+        // this.$nextTick(()=>{
+        //   if(Data.WatermarkReport==='true'){
+        //     this.setWaterMark(waterMarkStr)
+        //   }
+        //   this.setBlindWaterMark(waterMarkStr)
+        // })
     },
     setReportContent(str){
       let ps = str.split('</iframe>')