Karsa il y a 6 mois
Parent
commit
2fe5820d78

+ 2 - 2
src/views/report/reportDetail.vue

@@ -250,7 +250,7 @@ export default {
     },
     },
     hideTips() {
     hideTips() {
       //免责声明收起
       //免责声明收起
-      $("#tipsAlert").animate({ top: "-120rem" });
+      $("#tipsAlert").animate({ top: "-9999px" });
     },
     },
     goTop() {
     goTop() {
       document.body.scrollTop = document.documentElement.scrollTop = 0;
       document.body.scrollTop = document.documentElement.scrollTop = 0;
@@ -530,7 +530,7 @@ export default {
     padding: 15% 1rem;
     padding: 15% 1rem;
     box-sizing: border-box;
     box-sizing: border-box;
     position: fixed;
     position: fixed;
-    top: -120rem;
+    top: -9999px;
     left: 0;
     left: 0;
     background: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.6);
     z-index: 200;
     z-index: 200;

+ 10 - 3
src/views/report/reportDetailPdf.vue

@@ -31,9 +31,9 @@
       </div>
       </div>
 
 
 
 
-      <div id="abstract">
+      <div id="abstract" v-if="reportInfo.Abstract">
         <div class="abstract_cont">
         <div class="abstract_cont">
-          <div v-if="reportInfo.Abstract">摘要:{{ reportInfo.Abstract }}</div>
+          <div>摘要:{{ reportInfo.Abstract }}</div>
         </div>
         </div>
       </div>
       </div>
       <div style="padding: 0.6rem; box-sizing: border-box; overflow: hidden">
       <div style="padding: 0.6rem; box-sizing: border-box; overflow: hidden">
@@ -51,7 +51,10 @@
           <div v-html="reportInfo.Content"></div>
           <div v-html="reportInfo.Content"></div>
         </div>
         </div>
 
 
-        <div class="disclaimer" v-html="configInfo.Disclaimer"></div>
+        <div class="disclaimer" v-if="configInfo.Disclaimer">
+          <h3>免责声明:</h3>
+          <div v-html="configInfo.Disclaimer"></div>
+        </div>
     </div>
     </div>
     </div>
     </div>
   </div>
   </div>
@@ -337,9 +340,13 @@ export default {
   }
   }
 
 
   .disclaimer{
   .disclaimer{
+      margin-top: 30px;
       font-size: 0.58rem;
       font-size: 0.58rem;
       padding: 30px 0;
       padding: 30px 0;
       border-top: 1px solid #ccc;
       border-top: 1px solid #ccc;
+      h3 {
+        margin-bottom: 20px;
+      }
   }
   }
 }
 }
 // 不禁止页面打印,不然转pdf会出现空白页
 // 不禁止页面打印,不然转pdf会出现空白页

+ 2 - 2
src/views/reportEn/detail.vue

@@ -32,7 +32,7 @@
 
 
       <div id="abstract">
       <div id="abstract">
         <div class="abstract_cont">
         <div class="abstract_cont">
-          <div>Abstract:{{ reportInfo.Abstract }}</div>
+          <div v-if="reportInfo.Abstract">Abstract:{{ reportInfo.Abstract }}</div>
           <div style="color: #666; margintop: 1.2rem">
           <div style="color: #666; margintop: 1.2rem">
             *Note: Please be sure to read the <strong
             *Note: Please be sure to read the <strong
               style="fontweight: normal; cursor: pointer; color: #3e8ce6"
               style="fontweight: normal; cursor: pointer; color: #3e8ce6"
@@ -396,7 +396,7 @@ export default {
     font-family: 'segoe';
     font-family: 'segoe';
     .abstract_cont {
     .abstract_cont {
       border-left: 0.2rem solid #007aff;
       border-left: 0.2rem solid #007aff;
-      padding: 0.14rem 0.4rem;
+      padding: 0 0.4rem;
       box-sizing: border-box;
       box-sizing: border-box;
       color: #333;
       color: #333;
     }
     }

+ 6 - 3
src/views/reportEn/detailPdf.vue

@@ -30,7 +30,7 @@
         <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
         <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
       </div>
       </div>
 
 
-      <div id="abstract">
+      <div id="abstract" v-if="reportInfo.Abstract">
         <div class="abstract_cont">
         <div class="abstract_cont">
           <div>Abstract:{{ reportInfo.Abstract }}</div>
           <div>Abstract:{{ reportInfo.Abstract }}</div>
         </div>
         </div>
@@ -43,7 +43,10 @@
         <div id="resetcss" style="overflow:hidden;">
         <div id="resetcss" style="overflow:hidden;">
         <div v-html="reportInfo.Content"></div>
         <div v-html="reportInfo.Content"></div>
 
 
-        <div class="disclaimer" v-html="configInfo.DisclaimerEn"></div>
+        <div class="disclaimer"  v-if="configInfo.DisclaimerEn">
+          <h3>Disclaimer:</h3>
+          <div  v-html="configInfo.DisclaimerEn"></div>
+        </div>
       </div>
       </div>
     </div>
     </div>
     </div>
     </div>
@@ -250,7 +253,7 @@ export default {
     font-family: 'segoe';
     font-family: 'segoe';
     .abstract_cont {
     .abstract_cont {
       border-left: 0.2rem solid #007aff;
       border-left: 0.2rem solid #007aff;
-      padding: 0.14rem 0.4rem;
+      padding: 0 0.4rem;
       box-sizing: border-box;
       box-sizing: border-box;
       color: #333;
       color: #333;
     }
     }

+ 7 - 6
src/views/smartReport/detail.vue

@@ -225,7 +225,7 @@ export default {
     },
     },
     hideTips() {
     hideTips() {
       //免责声明收起
       //免责声明收起
-      $("#tipsAlert").animate({ top: "-120rem" });
+      $("#tipsAlert").animate({ top: "-9999px" });
     },
     },
     goTop() {
     goTop() {
       document.body.scrollTop = document.documentElement.scrollTop = 0;
       document.body.scrollTop = document.documentElement.scrollTop = 0;
@@ -395,11 +395,11 @@ body{
     }
     }
   }
   }
   .abstract{
   .abstract{
-    padding:10px 0; box-sizing:border-box; font-size:22px; line-height:36px;
+    box-sizing:border-box; font-size:22px; line-height:36px;
     border-left: 0.2rem solid #007aff;
     border-left: 0.2rem solid #007aff;
     margin:0.6rem 0;
     margin:0.6rem 0;
     div{
     div{
-        padding: 10px 20px;
+        padding: 5px 20px;
         box-sizing: border-box;
         box-sizing: border-box;
         color: #333;
         color: #333;
         border-radius: 10px;
         border-radius: 10px;
@@ -407,7 +407,6 @@ body{
   }
   }
   #playcon {
   #playcon {
     margin-top: 10px;
     margin-top: 10px;
-    padding: 0 0.6rem;
     box-sizing: border-box;
     box-sizing: border-box;
     background: #fff;
     background: #fff;
     overflow: hidden;
     overflow: hidden;
@@ -435,12 +434,14 @@ body{
   // }
   // }
   #tipsAlert {
   #tipsAlert {
     width: 100%;
     width: 100%;
+    max-width: 1130px;
     height: 100%;
     height: 100%;
     padding: 15% 1rem;
     padding: 15% 1rem;
     box-sizing: border-box;
     box-sizing: border-box;
     position: fixed;
     position: fixed;
-    top: -120rem;
-    left: 0;
+    top: -99999px;
+    left: 50%;
+    transform: translateX(-50%);
     background: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.6);
     z-index: 200;
     z-index: 200;
     .disclaimer {
     .disclaimer {

+ 9 - 4
src/views/smartReport/detailPdf.vue

@@ -24,9 +24,8 @@
           </div>
           </div>
         </div>
         </div>
         
         
-        <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice"> 
+        <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.Abstract"> 
           <div v-if="reportInfo.Abstract">摘要:{{ reportInfo.Abstract }}</div>
           <div v-if="reportInfo.Abstract">摘要:{{ reportInfo.Abstract }}</div>
-         
         </div>
         </div>
 
 
         <!-- 章节报告 -->
         <!-- 章节报告 -->
@@ -41,7 +40,10 @@
         </div>
         </div>
         <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content" v-else></div>
         <div id="resetcss" style="overflow:hidden;" v-html="reportInfo.Content" v-else></div>
 
 
-        <div class="disclaimer" v-html="configInfo.Disclaimer"></div>
+        <div class="disclaimer" v-if="configInfo.Disclaimer">
+          <h3>免责声明:</h3>
+          <div v-html="configInfo.Disclaimer"></div>
+        </div>
 
 
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
         <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
           <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
@@ -215,7 +217,7 @@ body{
     }
     }
   }
   }
   .abstract{
   .abstract{
-    padding:10px 0; box-sizing:border-box; font-size:22px; line-height:36px;
+    box-sizing:border-box; font-size:22px; line-height:36px;
     border-left: 0.2rem solid #007aff;
     border-left: 0.2rem solid #007aff;
     margin:0.6rem 0;
     margin:0.6rem 0;
     div{
     div{
@@ -261,6 +263,9 @@ body{
       font-size: 0.58rem;
       font-size: 0.58rem;
       padding: 30px 0;
       padding: 30px 0;
       border-top: 1px solid #ccc;
       border-top: 1px solid #ccc;
+      h3 {
+        margin-bottom: 20px;
+      }
   }
   }
 }
 }
 @media screen and (max-width:1200px){
 @media screen and (max-width:1200px){