From 34ca17da1d20a2476d9b43f17abcb15a9715111e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 21 Oct 2022 17:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=BB=9F=E8=AE=A1=E5=9B=BE=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/AllMoneyTenEcharts.vue |  4 +-
 src/views/dashboard/Analysis.vue           |  4 +-
 src/views/dashboard/IncomeSortEcharts.vue  | 62 +++++++++--------
 src/views/dashboard/NotReceivedEcharts.vue | 78 ++++++++++++----------
 src/views/dashboard/ThreeYearEcharts.vue   |  2 +-
 5 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue
index a112564..374a1f7 100644
--- a/src/views/dashboard/AllMoneyTenEcharts.vue
+++ b/src/views/dashboard/AllMoneyTenEcharts.vue
@@ -258,7 +258,7 @@ export default {
             name:'合同金额',
             data: this.echartsData.allMoney,
             type: 'bar',
-            barMaxWidth:30,
+            barMaxWidth:20,
             itemStyle:{
               borderRadius:[8,8,0,0]
             }
@@ -267,7 +267,7 @@ export default {
             name:'确认收入金额',
             data: this.echartsData.confirmAmount,
             type: 'bar',
-            barMaxWidth:30,
+            barMaxWidth:20,
             itemStyle:{
               borderRadius:[8,8,0,0]
             }
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 3fbf8e4..aaa59c9 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -25,9 +25,9 @@
 
       <section class="wrap">
 
-        <!-- 未收账款统计 -->
+        <!-- 营收账款统计 -->
         <not-received-echarts class="m-t-10 not-receiced"></not-received-echarts>
-        <!--  未收账款统计 -->
+        <!--  营收账款统计 -->
 
 
         <!-- 收入分类统计 -->
diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue
index 8473277..7f9b12e 100644
--- a/src/views/dashboard/IncomeSortEcharts.vue
+++ b/src/views/dashboard/IncomeSortEcharts.vue
@@ -27,33 +27,33 @@
     </div>
     <div class="echarts-box" id="incomeSort"></div>
     <!--   表格区域beign -->
-<!--    <div style="width: 100%">-->
-<!--      <a-table-->
-<!--        ref="table"-->
-<!--        size="middle"-->
-<!--        bordered-->
-<!--        rowKey="projectId"-->
-<!--        :columns="columns"-->
-<!--        :scroll="{x: 500}"-->
-<!--        :dataSource="dataSource"-->
-<!--        :pagination="false"-->
-<!--        class="j-table-force-nowrap main-table">-->
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="projectId"
+        :columns="columns"
+        :scroll="{x: 500}"
+        :dataSource="dataSource"
+        :pagination="false"
+        class="j-table-force-nowrap main-table">
 
-<!--        <template slot="text" slot-scope="text">-->
-<!--          <a-tooltip>-->
-<!--            <template slot="title">{{ text }}</template>-->
-<!--            <div class="table-text">{{ text }}</div>-->
-<!--          </a-tooltip>-->
-<!--        </template>-->
+        <template slot="text" slot-scope="text">
+          <a-tooltip>
+            <template slot="title">{{ text }}</template>
+            <div class="table-text">{{ text }}</div>
+          </a-tooltip>
+        </template>
 
-<!--        <template slot="allMoney" slot-scope="text">-->
-<!--          <a-tooltip>-->
-<!--            <template slot="title">{{ formatMoney(text) }}</template>-->
-<!--            <div class="table-text">{{ formatMoney(text) }}</div>-->
-<!--          </a-tooltip>-->
-<!--        </template>-->
-<!--      </a-table>-->
-<!--    </div>-->
+        <template slot="allMoney" slot-scope="text">
+          <a-tooltip>
+            <template slot="title">{{ formatMoney(text) }}</template>
+            <div class="table-text">{{ formatMoney(text) }}</div>
+          </a-tooltip>
+        </template>
+      </a-table>
+    </div>
     <!--   表格区域end -->
 
   </div>
@@ -202,8 +202,9 @@ export default {
         },
         legend: {
           bottom: '2%',
-          right: '5%',
-          padding: [0, 10, 0, 20]
+          right: '2%',
+          padding: [0,70, 0, 70],
+          itemGap:40 // 图例之间的间距
         },
         labelLine: {
           lineStyle: {
@@ -267,6 +268,13 @@ export default {
           scopedSlots: {customRender: 'allMoney'}
         },)
       })
+      // this.columns.push( {
+      //   title: '总数',
+      //   align: 'center',
+      //   width: 70,
+      //   dataIndex: 'allMoney',
+      //   scopedSlots: {customRender: 'text'}
+      // },)
     },
     // 处理圆点
     initPoint(data, color) {
diff --git a/src/views/dashboard/NotReceivedEcharts.vue b/src/views/dashboard/NotReceivedEcharts.vue
index a0a86d1..a9c2595 100644
--- a/src/views/dashboard/NotReceivedEcharts.vue
+++ b/src/views/dashboard/NotReceivedEcharts.vue
@@ -27,33 +27,33 @@
 <!--    </div>-->
     <div class="echarts-box" id="notReceived"></div>
     <!--   表格区域beign -->
-    <!--    <div style="width: 100%">-->
-    <!--      <a-table-->
-    <!--        ref="table"-->
-    <!--        size="middle"-->
-    <!--        bordered-->
-    <!--        rowKey="projectId"-->
-    <!--        :columns="columns"-->
-    <!--        :scroll="{x: 500}"-->
-    <!--        :dataSource="dataSource"-->
-    <!--        :pagination="false"-->
-    <!--        class="j-table-force-nowrap main-table">-->
+        <div style="width: 100%">
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="projectId"
+            :columns="columns"
+            :scroll="{x: 500}"
+            :dataSource="dataSource"
+            :pagination="false"
+            class="j-table-force-nowrap main-table">
 
-    <!--        <template slot="text" slot-scope="text">-->
-    <!--          <a-tooltip>-->
-    <!--            <template slot="title">{{ text }}</template>-->
-    <!--            <div class="table-text">{{ text }}</div>-->
-    <!--          </a-tooltip>-->
-    <!--        </template>-->
+            <template slot="text" slot-scope="text">
+              <a-tooltip>
+                <template slot="title">{{ text }}</template>
+                <div class="table-text">{{ text }}</div>
+              </a-tooltip>
+            </template>
 
-    <!--        <template slot="allMoney" slot-scope="text">-->
-    <!--          <a-tooltip>-->
-    <!--            <template slot="title">{{ formatMoney(text) }}</template>-->
-    <!--            <div class="table-text">{{ formatMoney(text) }}</div>-->
-    <!--          </a-tooltip>-->
-    <!--        </template>-->
-    <!--      </a-table>-->
-    <!--    </div>-->
+            <template slot="allMoney" slot-scope="text">
+              <a-tooltip>
+                <template slot="title">{{ formatMoney(text) }}</template>
+                <div class="table-text">{{ formatMoney(text) }}</div>
+              </a-tooltip>
+            </template>
+          </a-table>
+        </div>
     <!--   表格区域end -->
 
   </div>
@@ -153,25 +153,21 @@ export default {
       if (this.echartsInstace != null && this.echartsInstace != '' && this.echartsInstace != undefined) {
         this.echartsInstace.dispose()//销毁
       }
-      let typeEnum = {
-        allMoney: 1,
-        confirmAmount: 2,
-        income: 3
-      }
-      getAction(this.url.list, {type: typeEnum[this.activeIndex],departCode:this.queryParam.departCode}).then(res => {
+
+      getAction(this.url.list, {departCode:this.queryParam.departCode}).then(res => {
         if (res.success) {
           let dataSource = res.result
           this.initColumns(res.result)
           this.initEcharts(res.result)
           // 将接口数据 转化成表格数据形式
           let tableData = [
-            {indexName: typeEnum[this.activeIndex] !== 2 ? '合同金额' : '确收金额'},
-            {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 + '%'
           })
           this.dataSource = tableData
         }
@@ -204,7 +200,8 @@ export default {
         legend: {
           bottom: '2%',
           right: '5%',
-          padding: [0, 10, 0, 20]
+          padding: [0, 80, 0, 80],
+          itemGap:75
         },
         labelLine: {
           lineStyle: {
@@ -261,13 +258,20 @@ export default {
       ]
       data.map((item, index) => {
         this.columns.push({
-          title: item.name_dictText,
+          title: item.name,
           align: 'center',
-          width: 85,
+          width: 95,
           dataIndex: 'key' + index,
           scopedSlots: {customRender: 'allMoney'}
         },)
       })
+      // this.columns.push( {
+      //   title: '总数',
+      //   align: 'center',
+      //   width: 70,
+      //   dataIndex: 'allmoney',
+      //   scopedSlots: {customRender: 'text'}
+      // },)
     },
     // 处理圆点
     initPoint(data, color) {
diff --git a/src/views/dashboard/ThreeYearEcharts.vue b/src/views/dashboard/ThreeYearEcharts.vue
index c079df2..b723d07 100644
--- a/src/views/dashboard/ThreeYearEcharts.vue
+++ b/src/views/dashboard/ThreeYearEcharts.vue
@@ -268,7 +268,7 @@ export default {
             name: '应收金额',
             data: this.echartsData.allMoney,
             type: 'bar',
-            barMaxWidth: 30,
+            barMaxWidth: 60,
             itemStyle: {
               borderRadius: [8, 8, 0, 0]
             }