Browse Source

feat:市场分析报告

tsz 2 years ago
parent
commit
dc93415abd

+ 4 - 3
src/web/staticres/common-module/filter/js/project_cell.js

@@ -7,7 +7,7 @@ var projectCellTemp = `
     <span v-if="item.area">{{ item.area }}</span>
     <span v-if="item.bidStatus">{{ item.bidStatus }}</span>
     <span v-if="item.buyerClass">{{ item.buyerClass }}</span>
-    <span v-if="item.budget||item.bidAmount">{{ utils.moneyUnit(item.bidAmount || item.budget)}}</span>
+    <span v-if="item.budget||item.bidAmount">{{ setBidAmount || setBudget }}</span>
   </div>
   <div class="project-unit">
     <van-cell is-link @click="setBuyerLink(item)">
@@ -55,10 +55,11 @@ var projectCellComponent = {
   },
   computed: {
     setBidAmount () {
-      return this.item.bidAmount ? utils.moneyUnit(this.item.bidAmount) : '--'
+      if (this.item.bidAmount) {}
+      return this.item.bidAmount ? utils.moneyUnit(this.item.bidAmount, 'transfer', '万元') : '--'
     },
     setBudget () {
-      return this.item.budget ? utils.moneyUnit(this.item.budget) : '--'
+      return this.item.budget ? utils.moneyUnit(this.item.budget, 'transfer', '万元') : '--'
     },
     setWinner () {
       if (this.item.winner) {

+ 15 - 3
src/web/staticres/common-module/report-analysis/js/report_analysis.js

@@ -296,7 +296,7 @@ var vm = new Vue({
     notOneAreaCityFilter () {
       var area = this.reportFilters.area
       if (!this.notOneAreaFilter) {
-        var showCity = area && (area[Object.keys(area)].length >=2)
+        var showCity = area && (area[Object.keys(area)].length >=2 || area[Object.keys(area)].length === 0)
         return showCity
       } else {
         return this.notOneAreaFilter
@@ -399,6 +399,11 @@ var vm = new Vue({
             const areaSort = this.sections.areaScatter.sortType === 0 ? 'total' : 'amount'
             this.sections.areaScatter.setCityList = this.formatterWinData(item.areaDetails, areaSort)
             this.sections.areaScatter.setCityList = this.sections.areaScatter.setCityList.sort((a, b) => b[areaSort] - a[areaSort])
+            if(this.sections.areaScatter.setCityList.length > 5) {
+              this.sections.areaScatter.showAreaCityListBtn = true
+            } else {
+              this.sections.areaScatter.showAreaCityListBtn = false
+            }
           }
         })
       }
@@ -1381,8 +1386,15 @@ var vm = new Vue({
     },
     // 城市分布
     sortAreaCityScatter (areacitylist) {
-      const result  = areacitylist.reduce((max, item) => {
-        return item.total > max.total ? item : max
+      const list = areacitylist
+      const ZXS = ['北京', '天津', '上海', '重庆', '台湾', '澳门', '香港']
+      const result  = list.reduce((max, item) => {
+        const isTianjinIncluded = ZXS.includes(item.area)
+        if(!isTianjinIncluded) {
+          return item.total > max.total ? item : max
+        } else {
+          return max
+        }
       })
       if (result.areaDetails.length > 5) {
         this.sections.areaScatter.showAreaCityListBtn = true

+ 2 - 3
src/web/templates/big-member/wx/page_report_analysis.html

@@ -340,7 +340,6 @@
                             <div class="j-main area-content">
                                 <area-component
                                     :newprovincelist="reportFilters.area"
-                                    :showzxs="false"
                                     :showcountry="false"
                                     :multiple="false"
                                     ref="areaSelector"
@@ -444,7 +443,7 @@
                           </div>
                       </div>
                       <div class="section bg-white pd-16" v-if="showBuyerBtn && getStatus">
-                          <div class="section-title">项目数量TOP3采购单位及其重点合作中标单位</div>
+                          <div class="section-title">项目数量TOP30采购单位及其重点合作中标单位</div>
                           <div class="section-content">
                               <market-top3-table :table-data="showBuyerBtn" type="count" @save="saveState"></market-top3-table>
                               <div class="more" @click="sections.buyerclass.showCountAllBtn = false" v-if="sections.buyerclass.showCountAllBtn">
@@ -455,7 +454,7 @@
                       <div class="vip_component"
                         v-if="!getStatus"
                         style="height:10.8rem">
-                        <p class="example-title">项目数量TOP3采购单位及其重点合作中标单位</p>
+                        <p class="example-title">项目数量TOP30采购单位及其重点合作中标单位</p>
                         <div class="chart_com" style="background:url('/common-module/report-analysis/image/05-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
                           <chart-example type="item_5" imgurl='{{Msg "seo" "cdn"}}/common-module/report-analysis/image/05.png?v={{Msg "seo" "version"}}'>
                           </chart-example>