From 5e925b1743f747cabbfcba4f14fde2adfe62c5b6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 24 Oct 2022 10:27:40 +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=20=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue           |  4 ++--
 src/views/dashboard/NotReceivedEcharts.vue |  6 +++---
 src/views/dashboard/SingleMonthEcharts.vue | 23 ++++++++++++++++++----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index aaa59c9..a0b0703 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -128,7 +128,7 @@ export default {
 }
 // 未收入账款统计
 .not-receiced {
-  width: 49%;
+  width: 49.6%;
   min-width: 480px;
   height: auto;
   background: #fff;
@@ -137,7 +137,7 @@ export default {
 // 分类统计
 .income-sort {
   margin-left: 8px;
-  width: 49%;
+  width: 49.6%;
   min-width: 480px;
   height: auto;
   background: #fff;
diff --git a/src/views/dashboard/NotReceivedEcharts.vue b/src/views/dashboard/NotReceivedEcharts.vue
index fbcf668..37f09e0 100644
--- a/src/views/dashboard/NotReceivedEcharts.vue
+++ b/src/views/dashboard/NotReceivedEcharts.vue
@@ -1,7 +1,7 @@
 <!-- 未收账款统计-->
 <template>
   <div class="container">
-    <div class="title">营收账款
+    <div class="title">应收账款
       <a-tree-select
         :multiple="false"
         show-search
@@ -162,12 +162,12 @@ export default {
           // 将接口数据 转化成表格数据形式
           let tableData = [
             {indexName: '金额'},
-            // {indexName: '百分比'}
+            {indexName: '百分比'}
           ]
           dataSource.map((item, index) => {
             let dataIndex = 'key' + index
             tableData[0][dataIndex] = item.money
-            // tableData[1][dataIndex] = item.value + '%'
+            tableData[1][dataIndex] = item.value ? item.value + '%' :''
           })
           this.dataSource = tableData
         }
diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue
index e6f8cfb..b9f2261 100644
--- a/src/views/dashboard/SingleMonthEcharts.vue
+++ b/src/views/dashboard/SingleMonthEcharts.vue
@@ -74,7 +74,7 @@ const columns = [
   {
     title: '',
     align: 'center',
-    width: 90,
+    width: 110,
     dataIndex: 'indexName',
     scopedSlots: {customRender: 'text'}
   },
@@ -83,12 +83,20 @@ MonthData.map(tt => {
   columns.push({
     title: tt.name,
     align: 'center',
-    width: 100,
+    width: 115,
     dataIndex: tt.key,
     scopedSlots: {customRender: 'allMoney'}
   })
 })
 
+columns.push({
+  title: '总数',
+  align: 'center',
+  width: 100,
+  dataIndex: 'key12',
+  scopedSlots: {customRender: 'allMoney'}
+})
+
 
 export default {
   name: 'SingleMonthEcharts',
@@ -144,7 +152,14 @@ export default {
               tableData[1][key] = item.billMoney // 开票金额
               tableData[2][key] = item.comeAllMoney // 到账金额
             }
+            // 单月总数
+            if(index === 12){
+              tableData[0].key12 = item.confirmAmount // 确认收入金额
+              tableData[1].key12 = item.billMoney // 开票金额
+              tableData[2].key12 = item.comeAllMoney // 到账金额
+            }
           })
+
           this.initEchartsData(res.result)
           // 初始化 echarts
           this.initEcharts()
@@ -159,7 +174,7 @@ export default {
     },
     // 将后端返回的数据 处理成 echarts需要的数据 格式
     initEchartsData(data) {
-      data.map(item =>{
+      data.slice(0,12).map(item =>{
         // this.echartsData.allMoney.push(item.allMoney)
         this.echartsData.confirmAmount.push(item.confirmAmount)
         this.echartsData.billMoney.push(item.billMoney)
@@ -201,7 +216,7 @@ export default {
         },
         grid: {
           left: '2.4%',
-          right: '0%',
+          right: '5%',
           bottom: '3%',
           containLabel: true
         },