Merge branch 'fix_7285' into debug

src/views/hzyb/report/ChapterDetail.vue

@@ -505,10 +505,18 @@ export default {
     /*内容分割*/
     splitContentHandle(content) {
         content=addTokenToIframe(content,this.info.report_chapter_item.report_id,this.info.report_chapter_item.report_chapter_id)
-        const arr = content.split('</p>');
-        this.totalContent = arr.map(_ => _+'</p>');
-        this.realContent = this.totalContent.slice(0,this.pageSize)
-        this.total_page =  parseInt(this.totalContent.length / this.pageSize) + 1;
+        // 智能研报不分页
+        if(this.info.report_chapter_item.report_layout===2){
+          this.totalContent=[content]
+          this.realContent=[content]
+          this.total_page=1
+        }else{
+          const arr = content.split('</p>');
+          this.totalContent = arr.map(_ => _+'</p>');
+          this.realContent = this.totalContent.slice(0,this.pageSize)
+          this.total_page =  parseInt(this.totalContent.length / this.pageSize) + 1;
+        }
+        
         console.log( this.totalContent,this.realContent,this.total_page)
         this.formatSmartStyle()
     },

src/views/hzyb/report/Detail.vue

@@ -631,10 +631,18 @@ export default {
         /*内容分割*/
         splitContentHandle(content) {
             content=addTokenToIframe(content,this.reportId,0)
-            const arr = content.split('</p>');
-            this.totalContent = arr.map(_ => _+'</p>');
-            this.realContent = this.totalContent.slice(0,this.pageSize)
-            this.total_page =  parseInt(this.totalContent.length / this.pageSize) + 1;
+            // 智能研报不分页
+            if(this.info.report_info.report_layout===2){
+                this.totalContent=[content]
+                this.realContent=[content]
+                this.total_page=1
+            }else{
+                const arr = content.split('</p>');
+                this.totalContent = arr.map(_ => _+'</p>');
+                this.realContent = this.totalContent.slice(0,this.pageSize)
+                this.total_page =  parseInt(this.totalContent.length / this.pageSize) + 1; 
+            }
+            
             this.formatSmartStyle()
         },