From edf812b575067917f3f35c0c9413574509c745d2 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 8 Oct 2022 14:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=99=BE=E5=88=86=E6=AF=94=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/AllMoneyTenEcharts.vue     | 12 +++++++++++-
 src/views/dashboard/DepartmentTotalEcharts.vue | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue
index f30d2da..9ee6cce 100644
--- a/src/views/dashboard/AllMoneyTenEcharts.vue
+++ b/src/views/dashboard/AllMoneyTenEcharts.vue
@@ -187,6 +187,7 @@ export default {
         tooltip:{
           trigger: 'axis',
           formatter: params => {
+            let percent = this.calcPercent(params[1].data,params[0].data)
             // 获取xAxis data中的数据
             let dataStr = ''
             params.forEach(item => {
@@ -200,7 +201,7 @@ export default {
           </div>
         </div>`
             })
-            return dataStr
+            return dataStr + `  <div style="padding-left: 10px;color: #666">百分比：${percent}</div>`
           }
         },
         xAxis: {
@@ -299,6 +300,15 @@ export default {
       window.addEventListener('resize', () => {
         myChart.resize()
       })
+    },
+    /**
+     * 计算百分比
+     * @param num1 确收金额
+     * @param num2 合同金额
+     * */
+    calcPercent(num1,num2){
+      let pointNo = Number(num1) / Number(num2) * 100
+      return pointNo.toFixed(2) + '%'
     }
   }
 }
diff --git a/src/views/dashboard/DepartmentTotalEcharts.vue b/src/views/dashboard/DepartmentTotalEcharts.vue
index d99d930..b221b83 100644
--- a/src/views/dashboard/DepartmentTotalEcharts.vue
+++ b/src/views/dashboard/DepartmentTotalEcharts.vue
@@ -181,10 +181,11 @@ export default {
         tooltip: {
           trigger: 'axis',
           formatter: params => {
+            let percent = this.calcPercent(params[1].data,params[0].data)
             // 获取xAxis data中的数据
             let dataStr = ''
             params.forEach(item => {
-              dataStr += `<div>
+                dataStr += `<div>
           <div style="margin: 0 8px;">
             <div>
             <span style="display:inline-block;margin-right:5px;width:15px;height:10px;background-color:${item.color};border-radius: 3px"></span>
@@ -194,7 +195,7 @@ export default {
           </div>
         </div>`
             })
-            return dataStr
+            return dataStr + `  <div style="padding-left: 10px;color: #666">百分比：${percent}</div>`
           }
         },
         xAxis: {
@@ -292,6 +293,15 @@ export default {
       window.addEventListener('resize', () => {
         myChart.resize()
       })
+    },
+    /**
+     * 计算百分比
+     * @param num1 确收金额
+     * @param num2 合同金额
+     * */
+    calcPercent(num1,num2){
+      let pointNo = Number(num1) / Number(num2) * 100
+      return pointNo.toFixed(2) + '%'
     }
   }
 }