【修改】更换位置 增加完成比例

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;

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 {