Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_report_front

src/views/reportEn/detail.vue

@@ -42,6 +42,11 @@
       </div>
       <div style="padding: 0.6rem; box-sizing: border-box; overflow: hidden">
         <!-- <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content"></div> -->
+        <div id="overview" style="margin-bottom:1.25rem;font: 0.7rem/1.5 'segoe';" v-if="reportInfo.Overview">
+          <p><strong>Overview:</strong></p>
+          <!-- <p id="overview-content">{{reportInfo.Overview||''}}</p> -->
+          <div class="overview" style="overflow:hidden;margin-top:0.83rem;line-height:1.3rem;" v-html="reportInfo.Overview"></div>
+        </div>
         <div id="resetcss" style="overflow:hidden;">
         <ul>
           <li v-for="(html,index) in realContent" :key="index" v-html="html"></li>
@@ -167,6 +172,15 @@ export default {
     $("#resetcss")
       .find("pre")
       .css({ display: "block", whiteSpace: "pre-wrap" });
+    $("#overview")
+      .find("p")
+      .css({
+        margin: "0 auto 0",
+        font: "0.7rem/1.5 'segoe'",
+        color: "#333",
+        letterSpacing: "0",
+        lineHeight: "1.3rem",
+      });
   },
   methods: {
     showTips() {
@@ -182,7 +196,7 @@ export default {
     },
 
     async getreportdetail() {
-      const { Data,Ret  } = await reportEnDetail({ ReportCode: this.id });
+      const { Data,Ret  } = await reportEnDetail({ ReportCode: this.id,ShareEmail:Number(this.$route.query.ShareEmail)||0 });
         if (Ret !== 200) return
 
         this.reportInfo = Data.Report;
@@ -338,6 +352,11 @@ export default {
       margin-top: 1.5rem;
     }
   }
+  #overview{
+    padding:0.83rem;
+    background-color: rgba(77, 130, 191, 0.1);
+    border: 1px solid #E2E2E2;
+  }
   table {
     border-top: 1px solid #ccc;
     border-left: 1px solid #ccc;