Browse Source

fix:报告数据交互优化

zhangsiya 1 year ago
parent
commit
f34e703801

+ 9 - 8
apps/bigmember_pc/src/views/download-pdf/entReport.vue

@@ -53,8 +53,8 @@
         <div class="doc-footer-container">
           <span style="color: transparent">www.jianyu360.cn</span>
           <div>
-            <span class="now-page-num">2</span> /
-            <span class="all-page-num">{{ computedPageNum }}</span>
+            <span class="now-page-num">1</span> /
+            <span class="all-page-num">{{ computedPageNum - 1 }}</span>
           </div>
           <span class="highlight-text">www.jianyu360.cn</span>
         </div>
@@ -77,7 +77,7 @@
           <span style="color: transparent">www.jianyu360.cn</span>
           <div>
             <span class="now-page-num">2</span> /
-            <span class="all-page-num">{{ computedPageNum }}</span>
+            <span class="all-page-num">{{ computedPageNum - 1}}</span>
           </div>
           <span class="highlight-text">www.jianyu360.cn</span>
         </div>
@@ -152,8 +152,8 @@
           <div><span class="tip-red">*</span>按照“时间”排序,最多展示最近2年记录。</div>
         </div>
         <h2 v-if="areaFb.show">市场区域分布</h2>
-        <div class="sub-section" v-if="areaFb.show" style="height: 600px;"></div>
-        <div class="sub-section"v-if="areaFb.show">
+
+        <div v-if="areaFb.show">
           <map-chart
             id="areaFb"
             :options="areaFb.options"
@@ -209,12 +209,12 @@
         </div>
         <!-- 重点客户 -->
         <h2 v-if="keyClient.show">重点合作客户</h2>
-        <div class="sub-section" v-if="keyClient.show">
+        <div v-if="keyClient.show">
           <CommonTable :tableInfo="keyClient.topTableData"></CommonTable>
           <div><span class="tip-red">*</span>按照“中标金额”排序,最多展示前100条记录。</div>
         </div>
         <h2 v-if="keyClient.show">首次合作客户</h2>
-        <div class="sub-section" v-if="keyClient.show">
+        <div v-if="keyClient.show">
           <CommonTable :tableInfo="keyClient.firstTableData"></CommonTable>
           <div><span class="tip-red">*</span>按照“中标金额”排序,最多展示前100条记录。</div>
         </div>
@@ -1259,6 +1259,7 @@ export default {
       const pageEdge = new ComputedPageEdge({
         needPrependH2: true,
         firstPageNum: 4,
+        maxContentHeight: 800,
         callback: ({ pageNum, catalogueHtml }) => {
           this.computedPageNum = pageNum
           this.catalogueHtml = catalogueHtml
@@ -1269,7 +1270,7 @@ export default {
       })
       setTimeout(() => {
         pageEdge.addPageFooter('#report-content', 1360, 60)
-      }, 3 * 1000)
+      }, 1500)
     }
   }
 }

+ 5 - 5
apps/bigmember_pc/src/views/download-pdf/propReport.vue

@@ -54,8 +54,8 @@
         <div class="doc-footer-container">
           <span style="color: transparent">www.jianyu360.cn</span>
           <div>
-            <span class="now-page-num">2</span> /
-            <span class="all-page-num">{{ computedPageNum }}</span>
+            <span class="now-page-num">1</span> /
+            <span class="all-page-num">{{ computedPageNum -1 }}</span>
           </div>
           <span class="highlight-text">www.jianyu360.cn</span>
         </div>
@@ -78,7 +78,7 @@
           <span style="color: transparent">www.jianyu360.cn</span>
           <div>
             <span class="now-page-num">2</span> /
-            <span class="all-page-num">{{ computedPageNum }}</span>
+            <span class="all-page-num">{{ computedPageNum - 1}}</span>
           </div>
           <span class="highlight-text">www.jianyu360.cn</span>
         </div>
@@ -259,7 +259,6 @@
           ></bar-chart>
         </div>
         <!-- 合作企业注册地分布 -->
-
         <h2 v-if="area.show">合作企业注册地分布</h2>
         <div  v-if="area.show" >
           <map-chart
@@ -1753,6 +1752,7 @@ export default {
       const pageEdge = new ComputedPageEdge({
         needPrependH2: true,
         firstPageNum: 4,
+        maxContentHeight: 800,
         callback: ({ pageNum, catalogueHtml }) => {
           this.computedPageNum = pageNum
           this.catalogueHtml = catalogueHtml
@@ -1763,7 +1763,7 @@ export default {
       })
       setTimeout(() => {
         pageEdge.addPageFooter('#report-content', 1360, 60)
-      }, 3 * 1000)
+      }, 1500)
     }
   }
 }

+ 1 - 1
apps/bigmember_pc/src/views/download-pdf/utils/index.js

@@ -22,7 +22,7 @@ class ComputedPageEdge {
     if (
       $(dom).hasClass('sub-section') ||
       $(dom).hasClass('sub-section-content') ||
-      $(dom).hasClass('sub-stop-fill-check')
+      $(dom).hasClass('doc-head')
     )
       return false