瀏覽代碼

fix: 修复饼图展示问题

yangfeng 4 年之前
父節點
當前提交
f19c304094

+ 2 - 1
src/views/portrayal/components/AnalysisChart.vue

@@ -260,6 +260,7 @@ export default {
           return b.doc_money - a.doc_money
         })
         data.forEach((item) => {
+          item.avg = item.avg !== null && !isNaN(item.avg) ? (item.avg * 100).fixed(2) + '%' : '--'
           arr.push(item.key, item.doc_money, item.doc_count, item.avg, item.main)
         })
         const normal = ['行业', '类似项目规模', '类似项目数量', '平均折扣率', '是否当前项目']
@@ -381,7 +382,7 @@ export default {
       const percent = '<span style="padding-left:13px;">采购规模占比:' + params.percent + '%</span></br>'
       const scale = '<span style="padding-left:13px;">类似项目规模:' + (data[1] / 10000).fixed(2) + '万元</span></br>'
       const count = '<span style="padding-left:13px;">类似项目数量:' + data[2] + '个</span></br>'
-      const rate = (typeof data[3] === 'number' && !isNaN(data[3])) ? '<span style="padding-left:13px;">平均折扣率:' + (data[3] * 100).fixed(2) + '%</span></br>' : ''
+      const rate = data[3] === '--' ? '' : '<span style="padding-left:13px;">平均折扣率:' + data[3] + '</span></br>'
       tip = params.marker + params.name + '<br/>' + percent + scale + count + rate
       return tip
     },

+ 5 - 5
src/views/portrayal/components/EntChart.vue

@@ -342,9 +342,9 @@ export default {
         return b.bidamount_share - a.bidamount_share
       })
       data.forEach((item) => {
-        if (item.bidamount_share) {
-          arr.push(item.buyerClass, item.bidamount_share, item.bidamount_count, item.project_count, item.rate_avg ? item.rate_avg : 0)
-        }
+        item.bidamount_share = item.bidamount_share !== null && !isNaN(item.bidamount_share) ? (item.bidamount_share * 100).fixed(2) + '%' : '--'
+        item.rate_avg = item.rate_avg !== null && !isNaN(item.rate_avg) ? (item.rate_avg * 100).fixed(2) + '%' : '--'
+        arr.push(item.buyerClass, item.bidamount_share, item.bidamount_count, item.project_count, item.rate_avg)
       })
       const normal = ['行业', '中标金额占比', '中标金额', '项目数量', '平均折扣率']
       const newArr = this.arrTrans(5, arr)
@@ -355,10 +355,10 @@ export default {
         let tip = ''
         const d = params.data
         params.marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params.color + '"></span>'
-        const percent = '<span style="padding-left:13px;">中标金额占比:' + (d[1] * 100).fixed(2) + '%</span></br>'
+        const percent = '<span style="padding-left:13px;">中标金额占比:' + d[1] + '</span></br>'
         const scale = '<span style="padding-left:13px;">中标金额:' + moneyUnit(d[2].fixed(2)) + '</span></br>'
         const count = '<span style="padding-left:13px;">项目数量:' + d[3] + '个</span></br>'
-        const rate = (typeof d[4] === 'number' && !isNaN(d[4])) ? '<span style="padding-left:13px;">平均折扣率:' + (d[4] * 100).fixed(2) + '%</span></br>' : ''
+        const rate = d[4] === '--' ? '' : '<span style="padding-left:13px;">平均折扣率:' + d[4] + '</span></br>'
         tip = params.marker + params.name + '<br/>' + percent + scale + count + rate
         return tip
       }

+ 4 - 2
src/views/portrayal/components/UnitChart.vue

@@ -752,6 +752,8 @@ export default {
         return b.bidamount_share - a.bidamount_share
       })
       data.forEach((item) => {
+        item.bidamount_share = item.bidamount_share !== null && !isNaN(item.bidamount_share) ? (item.bidamount_share * 100).fixed(2) + '%' : '--'
+        item.rate_avg = item.rate_avg !== null && !isNaN(item.rate_avg) ? (item.rate_avg * 100).fixed(2) + '%' : '--'
         arr.push(item.scopeclassName, item.bidamount_share, item.bidamount_count, item.project_count, item.rate_avg)
       })
       const normal = ['行业', '采购规模占比', '采购规模', '采购项目数量', '平均节支率']
@@ -762,10 +764,10 @@ export default {
         var tip = ''
         var data = params.data
         params.marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params.color + '"></span>'
-        var percent = '<span style="padding-left:13px;">采购规模占比:' + (data[1] * 100).fixed(2) + '%</span></br>'
+        var percent = '<span style="padding-left:13px;">采购规模占比:' + data[1] + '</span></br>'
         var scale = '<span style="padding-left:13px;">采购规模:' + moneyUnit(data[2].fixed(2)) + '</span></br>'
         var count = '<span style="padding-left:13px;">采购项目数量:' + data[3] + '个</span></br>'
-        var rate = (typeof data[4] === 'number' && !isNaN(data[4])) ? '<span style="padding-left:13px;">平均节支率:' + (data[4] * 100).fixed(2) + '%</span></br>' : ''
+        var rate = data[4] === '--' ? '' : '<span style="padding-left:13px;">平均节支率:' + data[4] + '</span></br>'
         tip = params.marker + params.name + '<br/>' + percent + scale + count + rate
         return tip
       }