Merge branch 'eta1.8.3'；更新eta_comp

src/views/report/reportDetail.vue

@@ -79,21 +79,22 @@
         </div>
       </div>
       <div style="padding: 0.6rem; box-sizing: border-box; overflow: hidden">
-        <!-- <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div> -->
-        <!-- 晨报周报 -->
+
+        <!-- 章节报告 -->
         <div class="chapter-wrap" v-if="reportInfo.HasChapter===1">
           <div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
             <div style="margin-bottom:10px">
-              <span class="type">{{item.TypeName}}</span>
+              <span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
               <span class="title">{{item.Title}}</span>
             </div>
             <div id="resetcss" style="overflow:hidden;" v-html="item.Content"></div>
           </div>
         </div>
+
         <div id="resetcss" style="overflow:hidden;" v-else>
-        <ul>
-          <li v-for="(html,index) in realContent" :key="index" v-html="html"></li>
-        </ul>
+          <ul>
+            <li v-for="(html,index) in realContent" :key="index" v-html="html"></li>
+          </ul>
       </div>
       <div id="tipsAlert">
         <div

src/views/report/reportDetailPdf.vue

@@ -70,7 +70,7 @@
         <div class="chapter-wrap" v-if="reportInfo.HasChapter===1">
           <div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
             <div style="margin-bottom:10px">
-              <span class="type">{{item.TypeName}}</span>
+              <span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
               <span class="title">{{item.Title}}</span>
             </div>
             <div id="resetcss" style="overflow:hidden;" v-html="item.Content"></div>

src/views/smartReport/detail.vue

@@ -29,7 +29,19 @@
         <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
           <div v-if="reportInfo.Abstract">摘要： <span v-html="reportInfo.Abstract"></span></div> 
         </div>
-        <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div>
+
+        <!-- 章节报告 -->
+        <div class="chapter-wrap" v-if="reportInfo.HasChapter===1">
+          <div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
+            <div style="margin-bottom:10px">
+              <span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
+              <span class="title">{{item.Title}}</span>
+            </div>
+            <div id="resetcss" style="overflow:hidden;" v-html="item.Content"></div>
+          </div>
+        </div>
+        <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content" v-else></div>
+
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
           <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
@@ -38,12 +50,7 @@
           }">
               {{ layoutBaseInfo[item.value] }}
           </div>
-        </div> 
-        <!-- <div id="resetcss">
-          <ul>
-            <li v-for="(html, index) in realContent" :key="index" v-html="html"></li>
-          </ul>
-        </div> -->
+        </div>
         <div id="tipsAlert">
           <div
             style="
@@ -87,7 +94,7 @@
 </template>
 
 <script>
-import { smartReportDetail } from "@/api/api.js";
+import { smartReportDetail,reportDetail } from "@/api/api.js";
 import _ from "lodash";
 import wxShare from "../utils/wxShare.js";
 
@@ -131,51 +138,12 @@ export default {
     window.removeEventListener('resize',this.pageResize)
   },
 
-  updated() {
-    // $('#resetcss').css({font:"0.76rem/1.5 '微软雅黑'",color:"#333",letterSpacing:"0.05rem"});
-    // $("#resetcss")
-    //   .find("img")
-    //   .css({ display: "block", margin: "0 auto", maxWidth: "100%" });
-    // $("#resetcss")
-    //   .find("video")
-    //   .css({ display: "block", margin: "0 auto", maxWidth: "100%" });
-    // $("#resetcss")
-    //   .find("p")
-    //   .css({
-    //     margin: "0 auto 0",
-    //     font: "0.7rem/1.5 'PingFang-SC-Regular'",
-    //     color: "#333",
-    //     letterSpacing: "0.08rem",
-    //     lineHeight: "1.3rem",
-    //   });
-    /* $("#resetcss")
-      .find("span")
-      .css({
-        font: "0.7rem/1.5 'PingFang-SC-Regular'",
-        letterSpacing: "0.08rem",
-        lineHeight: "1.3rem",
-      }); */
-    // $("#resetcss")
-    //   .find("span.fr-emoticon")
-    //   .css({
-    //     width: "20px",
-    //     height: "20px",
-    //     backgroundRepeat: "no-repeat",
-    //     backgroundSize: "cover",
-    //     display: "inline-block",
-    //     verticalAlign: "middle",
-    //   });
-    // $("#resetcss").find("ol").css({ listStyleType: "disc" });
-    // $("#resetcss")
-    //   .find("pre")
-    //   .css({ display: "block", whiteSpace: "pre-wrap" });
-  },
   methods: {
     pageResize(){
       const el=document.getElementById('reportdtl')
       const windowWid=document.body.clientWidth
-      if(windowWid<800){
-        el.style.transform=`scale(${windowWid/800})`
+      if(windowWid<1200){
+        el.style.transform=`scale(${windowWid/1200})`
         // el.style.
       }
     },
@@ -193,7 +161,7 @@ export default {
     },
 
     async getreportdetail() {
-      const { Data, Ret } = await smartReportDetail({ ReportCode: this.id });
+      const { Data, Ret } = await reportDetail({ ReportCode: this.id });
       document.title = (Data && Data.H5ShareName) || "研报";
       if (Ret !== 200) return;
       // console.log('data',Data)
@@ -300,7 +268,7 @@ body{
   font-size: 14px;
   background: #fff;
   overflow: auto;
-  width: 800px;
+  width: 1200px;
   padding: 20px 20px 20px 44px;
   margin: 0 auto;
 
@@ -385,8 +353,28 @@ body{
       font-size: 0.58rem;
     }
   }
+
+  .chapter-wrap{
+    .chapter-item{
+			margin-bottom: 20px;
+			padding-bottom: 20px;
+			border-bottom: 1px dashed #ccc;
+			.type{
+				font-size: 15px;
+				color: #fff;
+				padding: 5px 10px;
+				background-color: #E6A23C;
+				border-radius: 4px;
+			}
+			.title{
+				font-size: 15px;
+				margin-left: 10px;
+				font-weight: bold;
+			}
+		}
+  }
 }
-@media screen and (max-width:800px){
+@media screen and (max-width:1200px){
   #reportdtl{
     position: absolute;
     transform-origin: 0 0;

src/views/smartReport/detailPdf.vue

@@ -22,7 +22,19 @@
         <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
           <div v-if="reportInfo.Abstract">摘要： <span v-html="reportInfo.Abstract"></span></div> 
         </div>
-        <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div>
+
+        <!-- 章节报告 -->
+        <div class="chapter-wrap" v-if="reportInfo.HasChapter===1">
+          <div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">
+            <div style="margin-bottom:10px">
+              <span class="type" v-if="item.TypeName">{{item.TypeName}}</span>
+              <span class="title">{{item.Title}}</span>
+            </div>
+            <div id="resetcss" style="overflow:hidden;" v-html="item.Content"></div>
+          </div>
+        </div>
+        <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content" v-else></div>
+
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
           <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
@@ -38,7 +50,7 @@
 </template>
 
 <script>
-import { smartReportDetail } from "@/api/api.js";
+import { smartReportDetail,reportDetail } from "@/api/api.js";
 
 export default {
   data() {
@@ -70,13 +82,13 @@ export default {
     pageResize(){
       const el=document.getElementById('reportdtl')
       const windowWid=document.body.clientWidth
-      if(windowWid<800){
-        el.style.transform=`scale(${windowWid/800})`
+      if(windowWid<1200){
+        el.style.transform=`scale(${windowWid/1200})`
         // el.style.
       }
     },
     async getreportdetail() {
-      const { Data, Ret } = await smartReportDetail({ ReportCode: this.id });
+      const { Data, Ret } = await reportDetail({ ReportCode: this.id });
       if (Ret !== 200) return;
       
       this.reportInfo = Data.Report;
@@ -146,8 +158,8 @@ body{
   font-size: 14px;
   background: #fff;
   overflow: auto;
-  width: 800px;
-  padding: 20px;//说是转的图片两侧的空白要一样长
+  width: 1200px;
+  padding: 20px;
   margin: 0 auto;
 
   .top-header {
@@ -200,8 +212,28 @@ body{
                 margin-bottom: 3px;
             }
   }
+
+  .chapter-wrap{
+    .chapter-item{
+			margin-bottom: 20px;
+			padding-bottom: 20px;
+			border-bottom: 1px dashed #ccc;
+			.type{
+				font-size: 15px;
+				color: #fff;
+				padding: 5px 10px;
+				background-color: #E6A23C;
+				border-radius: 4px;
+			}
+			.title{
+				font-size: 15px;
+				margin-left: 10px;
+				font-weight: bold;
+			}
+		}
+  }
 }
-@media screen and (max-width:800px){
+@media screen and (max-width:1200px){
   #reportdtl{
     position: absolute;
     transform-origin: 0 0;

src/views/smartReport/getReportImg.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { smartReportDetail } from "@/api/api.js";
+import { smartReportDetail,reportDetail } from "@/api/api.js";
 import _ from "lodash";
 
 export default {
@@ -50,8 +50,8 @@ export default {
     pageResize(){
       const el=document.getElementById('reportdtl')
       const windowWid=document.body.clientWidth
-      if(windowWid<800){
-        el.style.transform=`scale(${windowWid/800})`
+      if(windowWid<1200){
+        el.style.transform=`scale(${windowWid/1200})`
       }
     },
 
@@ -60,7 +60,7 @@ export default {
     },
 
     async getreportdetail() {
-      const { Data, Ret } = await smartReportDetail({ ReportCode: this.id });
+      const { Data, Ret } = await reportDetail({ ReportCode: this.id });
       document.title = (Data && Data.H5ShareName) || "研报";
       if (Ret !== 200) return;
       // console.log('data',Data)
@@ -119,7 +119,7 @@ body{
   font-size: 14px;
   background: #fff;
   overflow: auto;
-  width: 800px;
+  width: 1200px;
   padding: 20px 20px 20px 44px;
   margin: 0 auto;
 
@@ -167,7 +167,7 @@ body{
   //   word-break: break-all;
   // }
 }
-@media screen and (max-width:800px){
+@media screen and (max-width:1200px){
   #reportdtl{
     position: absolute;
     transform-origin: 0 0;