Bläddra i källkod

feat: 周报月报滚动高度记录逻辑优化

cuiyalong 2 år sedan
förälder
incheckning
8edcb7bcc2

+ 7 - 4
src/components/report-data/ProjectTopTable.vue

@@ -111,7 +111,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          width="90"
+          width="150"
           header-align="center"
           align="right"
           label="项目规模(万元)">
@@ -119,7 +119,7 @@
             {{ scope.row.bidamount || '--' }}
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="bidamount"
           width="90"
           header-align="center"
@@ -128,7 +128,7 @@
           <template slot-scope="scope">
             {{ scope.row.bidamount || '--' }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="buyer"
           header-align="center"
@@ -195,7 +195,7 @@
           width="114"
           label="注册省市">
           <template slot-scope="scope">
-            {{ scope.row.area || '--'}} {{ scope.row.city }}
+            {{ scope.row.area || '--'}}<template v-if="scope.row.city">-</template>{{ scope.row.city }}
           </template>
         </el-table-column>
         <el-table-column
@@ -375,6 +375,9 @@ export default {
   .ellipsis-5.el-link {
     @include ellipsis(5);
   }
+  .el-link.el-link--default {
+    color: #1d1d1d;
+  }
 }
 .inline {
   display: inline;

+ 1 - 1
src/views/analysisReport/MarketAnalysisResult.vue

@@ -41,7 +41,7 @@
     <div class="bg-grey-h24"></div>
     <el-tabs class="tabs sticky-tab-container" v-model="tabActiveName" :before-leave="beforeTabLeave">
       <el-tab-pane label="市场分析" name="1">
-        <div class="analysis-result-list">
+        <div class="analysis-result-list" v-if="tabActiveName === '1'">
           <section class="analysis-result-section section-market">
             <div class="analysis-result-title pd-lr20">市场规模</div>
             <div class="analysis-result-content sub-section-list">

+ 10 - 4
src/views/reportData/pageMonth.vue

@@ -29,7 +29,7 @@
         </div>
         <el-tabs class="tabs sticky-tab-container" v-model="tabActiveName" v-if="isFinish" :before-leave="beforeTabLeave">
           <el-tab-pane label="本月分析" name="1">
-            <div class="echartsView" >
+            <div class="echartsView" v-if="tabActiveName === '1'">
               <!-- 项目数量 -->
               <div class="chart" v-if="pCount.show">
                 <div class="chart_title">项目数量</div>
@@ -1071,8 +1071,10 @@ export default {
       this.scrollToTab()
     },
     scrollToTab () {
-      const target = this.$el.querySelector('.tabs.sticky-tab-container')
-      target.scrollIntoView()
+      const { stickyTop } = this.scrollTopInfo
+      setTimeout(() => {
+        window.scrollTo(0, stickyTop)
+      }, 10)
     },
     calcStickyTop () {
       const tabs = this.$el.querySelector('.tabs.sticky-tab-container')
@@ -1085,7 +1087,11 @@ export default {
       if (stickyTop <= 0) return
       setTimeout(() => {
         const scrollTop = this.scrollTopInfo[targetActiveName]
-        window.scrollTo(0, scrollTop)
+        if (scrollTop < stickyTop) {
+          window.scrollTo(0, stickyTop)
+        } else {
+          window.scrollTo(0, scrollTop)
+        }
       }, 10)
     },
     recordScrollTop (tab) {

+ 6 - 2
src/views/reportData/pageWeek.vue

@@ -49,7 +49,7 @@
       </div>
       <el-tabs class="tabs sticky-tab-container" v-model="tabActiveName" v-if="nodata" :before-leave="beforeTabLeave">
         <el-tab-pane label="本周分析" name="1">
-          <div class="echartsView" >
+          <div class="echartsView" v-if="tabActiveName === '1'">
             <!-- 本周新增招标项目数量 -->
             <div class="newAdd_bid" v-if="newDrawCount.show">
               <div class="chart-title">本周新增招标项目数量</div>
@@ -436,7 +436,11 @@ export default {
       if (stickyTop <= 0) return
       setTimeout(() => {
         const scrollTop = this.scrollTopInfo[targetActiveName]
-        window.scrollTo(0, scrollTop)
+        if (scrollTop < stickyTop) {
+          window.scrollTo(0, stickyTop)
+        } else {
+          window.scrollTo(0, scrollTop)
+        }
       }, 10)
     },
     recordScrollTop (tab) {