Merge branch 'dev/v1.0.51_zsy' of jianyu/web into feature/v1.0.51

apps/bigmember_pc/src/views/analysisReport/MarketAnalysisResult.vue

@@ -486,7 +486,7 @@
                 </div>
               </div>
               <div class="top3-table-list pd-lr20">
-                <div class="ar-table winner-count-top3" v-if="isConf26">
+                <div class="ar-table winner-count-top3" v-if="isConf26 && sections.winner.projectCountTop3">
                   <p class="ar-table-title">
                     项目数量TOP30中标单位及其重点合作采购单位
                   </p>
@@ -507,7 +507,7 @@
                   k="项目数量TOP30中标单位及其重点合作采购单位"
                   :item="vipUpgradeMap[Object.keys(vipUpgradeMap)[6]]"
                 ></MaskCard>
-                <div class="ar-table winner-amount-top3" v-if="isConf26">
+                <div class="ar-table winner-amount-top3" v-if="isConf26 && sections.winner.projectAmountTop3">
                   <p class="ar-table-title">
                     中标金额TOP30中标单位及其重点合作采购单位
                   </p>

apps/bigmember_pc/src/views/download-pdf/entReport.vue

@@ -229,10 +229,10 @@
             </template>
           </el-table-column>
           <el-table-column label="公告标题" prop="title" align="center"></el-table-column>
-          <el-table-column label="中标单位" prop="buyer" align="center"></el-table-column>
+          <el-table-column label="采购单位" prop="buyer" align="center"></el-table-column>
           <el-table-column label="中标金额（万元）" align="center">
             <template slot-scope="scope">
-              {{ calcMoney(scope.row.bidamount) }}
+              {{ scope.row.bidamount ? calcMoney(scope.row.bidamount) : ''}}
             </template>
           </el-table-column>
           <el-table-column label="发布时间">

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

@@ -297,7 +297,7 @@
         </el-table-column>
         <el-table-column label="中标金额（万元）" align="center">
           <template slot-scope="scope">
-            {{ calcMoney(scope.row.bidamount) }}
+            {{ scope.row.bidamount ? calcMoney(scope.row.bidamount) : ''}}
           </template>
         </el-table-column>
         <el-table-column label="公告时间">

apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue

@@ -504,7 +504,8 @@ export default {
       reportDownloadConfig: {
         visible: false,
         hasPower: false,
-        totalNum: 0
+        // 项目总数
+        projectCount: 0
       }
     }
   },
@@ -604,9 +605,6 @@ export default {
       ? $('#public-nav').height()
       : 52
     $('#entTabNav').css('top', headerHeight + 'px')
-    $bus.$on('sendCount', (data) => {
-      this.reportDownloadConfig.totalNum = data
-    })
   },
   destroyed() {
     window.removeEventListener('scroll', this.watchScroll)
@@ -813,6 +811,7 @@ export default {
         data.timeRange.end * 1000,
         'yyyy/MM/dd'
       )
+      this.reportDownloadConfig.projectCount = data?.project_count || 0
     },
     // 查询是否认领
     getClaimStatus() {

apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue

@@ -451,7 +451,6 @@ import { mapState } from 'vuex'
 import { TabPane, Tabs } from 'element-ui'
 import { dateFormatter, getAssetsFile, moneyUnit } from '@/utils'
 import tdk from '@/utils/mixins/set-tdk.js'
-import $bus from '@/utils/bus'
 import { pointType } from '@/utils/mixins/calc-point-type'
 import {
   getEntSearchPower,
@@ -674,7 +673,8 @@ export default {
       reportDownloadConfig: {
         visible: false,
         hasPower: false,
-        totalNum: 0
+        // 项目总数
+        projectCount: 0
       }
     }
   },
@@ -926,9 +926,6 @@ export default {
       ? $('#public-nav').height()
       : 52
     $('.tab-header.bg-white').css('top', this.headerHeight + 'px')
-    $bus.$on('sendCount', (data) => {
-      this.reportDownloadConfig.totalNum = data
-    })
   },
   beforeDestroy() {
     window.$noIntercept = false
@@ -1221,6 +1218,7 @@ export default {
         data.timeRange.end * 1000,
         'yyyy/MM/dd'
       )
+      this.reportDownloadConfig.projectCount = data?.project_count || 0
     },
     // 查询是否认领
     getClaimStatus() {

apps/bigmember_pc/src/views/portrayal/UnitPortrayal.vue

@@ -173,7 +173,7 @@
           hasTitleLeftBlue
         ></MaskCard>
       </div>
-      <div v-if="!noBuyerAuth">
+      <div v-show="!noBuyerAuth">
         <!-- 筛选部分 -->
         <div class="unit-info" v-if="!noBuyerAuth">
           <div class="markPosition zbdt">
@@ -265,7 +265,7 @@
           @sendParam="sendParam"
         ></UnitChart>
       </div>
-      <div class="no-login-tip-container" v-else>
+      <div class="no-login-tip-container" v-show="noBuyerAuth">
         <div class="p-l-r-32">
           <div class="markPosition zbdt">
             <div class="item"></div>
@@ -1543,7 +1543,6 @@ export default {
     },
     getBaseInfo(data) {
       // 子组件传来的值
-      console.log(data)
       if (!data && !data.buyerName) return
       if (!data.buyerName) {
         data.buyerName = this.info.buyerName

apps/bigmember_pc/src/views/portrayal/components/EntReportDownloadDialog.vue

@@ -24,7 +24,7 @@
         :canSelect="canSelect"
         @changeFilter="changeFilter"
       ></download-filter>
-      <section class="empty" v-if="!hasPower && (emptyShow || totalNum === 0)">
+      <section class="empty" v-if="!hasPower && (emptyShow || options.projectCount === 0)">
         <div>该企业暂无中标项目，暂无法下载报告</div>
       </section>
       <section class="empty" v-if="hasPower && emptyShow">
@@ -87,7 +87,7 @@ export default {
         return {
           visible:false,
           hasPower: true,
-          totalNum: 0
+          projectCount: 0
         }
       }
     },
@@ -144,7 +144,7 @@ export default {
         scopeClass: '', // 行业
         timeRange: 2018 + '_' + new Date().getFullYear(), // 成交时间范围
         buyerClass: '' // 采购单位类型
-      },
+      }
     }
   },
   watch: {},
@@ -152,13 +152,9 @@ export default {
     hasPower() {
       return this.options.hasPower
     },
-    // 中标动态的数据
-    totalNum () {
-      return this.options.totalNum
-    },
+    // 分析数据有数据则展示，无数据则不展示
     showEmailAndTip () {
-      // 有数据
-      return !this.emptyShow && this.totalNum > 0
+      return this.options.projectCount > 0
     }
   },
   created() {

apps/bigmember_pc/src/views/portrayal/components/UnitChart.vue

@@ -908,8 +908,6 @@ export default {
   },
   watch: {
     params(newval) {
-      console.log('----------筛选条件变更--------')
-      console.log(newval)
       this.getChartData(newval)
     },
     allBool: {
@@ -1428,6 +1426,7 @@ export default {
           ? moneyUnit(res.bidamount_count)
           : '--'
         info.fail_count = res.fail_count ? res.fail_count + '条' : '--'
+        info.project_count = res.project_count || 0
         this.$emit('baseInfo', info)
         if (
           !res.project_count &&

apps/bigmember_pc/src/views/portrayal/components/UnitReportDownloadDialog.vue

@@ -24,7 +24,7 @@
         :canSelect="canSelect"
         @changeFilter="changeFilter"
       ></download-filter>
-      <section class="empty" v-if="!hasPower && (emptyShow || totalNum === 0)">
+      <section class="empty" v-if="!hasPower && (emptyShow || this.totalInfo.project_count === 0)">
         <div>该业主暂无采购项目，暂无法下载报告</div>
       </section>
       <section class="empty" v-if="hasPower && emptyShow">
@@ -75,7 +75,7 @@
 
 <script>
 import DownloadFilter from './DownloadFilter.vue'
-import { getPDFPackBalance, sendPdfEmail, getPdfEmail, savePdfCondition, ajaxExportPdf } from '@/api/modules/'
+import { getPDFPackBalance, getPdfEmail, savePdfCondition, ajaxExportPdf } from '@/api/modules/'
 import { emailRegExp } from '@/utils/constant'
 import { debounce } from '@/utils/'
 
@@ -90,7 +90,7 @@ export default {
         return {
           visible:false,
           hasPower: false,
-          totalNum: 0
+          totalNum: 0 // 招标动态数据
         }
       }
     },
@@ -150,13 +150,9 @@ export default {
     hasPower() {
       return this.options.hasPower
     },
-    // 招标动态的数据
-    totalNum () {
-      return this.options.totalNum
-    },
     showEmailAndTip () {
       // 有数据
-      return !this.emptyShow && this.totalNum > 0
+      return  this.totalInfo.project_count
     }
   },
   created() {