From 612ff4a679661f5b7035cf008791addc5d846305 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 25 Oct 2022 09:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=BD=8D=E7=BD=AE=20=E5=A2=9E=E5=8A=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue               | 17 ++++++++---------
 src/views/dashboard/DepartmentTotalEcharts.vue |  5 ++++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index a0b0703..ede7d79 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -24,15 +24,14 @@
       <!-- 科室总体统计 -->
 
       <section class="wrap">
+        <!-- 收入分类统计 -->
+        <income-sort-echarts class="income-sort m-t-10"></income-sort-echarts>
+        <!-- 收入分类统计 -->
 
         <!-- 营收账款统计 -->
         <not-received-echarts class="m-t-10 not-receiced"></not-received-echarts>
         <!--  营收账款统计 -->
 
-
-        <!-- 收入分类统计 -->
-        <income-sort-echarts class="income-sort m-t-10"></income-sort-echarts>
-        <!-- 收入分类统计 -->
       </section>
 
       <!--应收合同额统计 -->
@@ -100,13 +99,13 @@ export default {
 .single-month-total,
 .three-year {
   width: 100%;
-  height: 700px;
+  height: auto;
   background: #fff;
 }
 
-.three-year {
-  height: 620px;
-}
+//.three-year {
+//  height: 620px;
+//}
 
 .m-t-10 {
   margin-top: 10px;
@@ -136,7 +135,7 @@ export default {
 
 // 分类统计
 .income-sort {
-  margin-left: 8px;
+  //margin-left: 8px;
   width: 49.6%;
   min-width: 480px;
   height: auto;
diff --git a/src/views/dashboard/DepartmentTotalEcharts.vue b/src/views/dashboard/DepartmentTotalEcharts.vue
index 491418c..b136123 100644
--- a/src/views/dashboard/DepartmentTotalEcharts.vue
+++ b/src/views/dashboard/DepartmentTotalEcharts.vue
@@ -112,12 +112,14 @@ export default {
           // 将接口数据 转化成表格数据形式
           let tableData = [
             {indexName: '合同金额'},
-            {indexName: '确认收入金额'}
+            {indexName: '确认收入金额'},
+            {indexName: '完成比例'}
           ]
           dataSource.map((item, index) => {
             let dataIndex = 'key' + index
             tableData[0][dataIndex] = item.allMoney
             tableData[1][dataIndex] = item.confirmAmount
+            tableData[2][dataIndex] = this.calcPercent(item.confirmAmount,item.allMoney)
           })
           this.dataSource = tableData
         }
@@ -312,6 +314,7 @@ export default {
   padding: 20px;
   box-sizing: border-box;
   width: 100%;
+  //height: auto;
 }
 
 .title {