From d3312ad960c9571cf59d2ea293a245c54e376aca Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 21 Feb 2023 16:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue          |  2 +-
 src/views/dashboard/IncomeSortEcharts.vue | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index a57b82a..a78f1ff 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -147,7 +147,7 @@ export default {
 .income-sort {
   //margin-left: 8px;
   width: 49.6%;
-  min-width: 480px;
+  min-width: 600px;
   height: auto;
   background: #fff;
 }
diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue
index 4758114..126eaf6 100644
--- a/src/views/dashboard/IncomeSortEcharts.vue
+++ b/src/views/dashboard/IncomeSortEcharts.vue
@@ -10,12 +10,13 @@
         tree-default-expand-all
         tree-node-filter-prop="title"
         @change="changeDepart"
-        style="width:30%"
+        style="width:20%"
         :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
         :treeData="treeDepartData"
         v-model="queryParam.departCode"
         placeholder="请选择部门">
       </a-tree-select>
+      <j-year-date  style="width:20%" class="year" placeholder="请选择年份" v-model="queryParam.year" @change="loadData"></j-year-date>
     </div>
     <div class="operator">
       <span @click="toggleEcharts('income')" class="operator-left"
@@ -81,6 +82,7 @@ echarts.use([
 import {getAction} from '@api/manage'
 import {formatMoney} from '@/utils/formatMoney'
 import {queryDepartTreeList} from '@api/api'
+import JYearDate from '@comp/jero/JYearDate'
 
 const columns = [
   {
@@ -94,6 +96,9 @@ const columns = [
 
 export default {
   name: 'IncomeSortEcharts',
+  components:{
+    JYearDate
+  },
   data() {
     return {
       activeIndex: 'income',
@@ -158,7 +163,7 @@ export default {
         confirmAmount: 2,
         income: 3
       }
-      getAction(this.url.list, {type: typeEnum[this.activeIndex],departCode:this.queryParam.departCode}).then(res => {
+      getAction(this.url.list, {type: typeEnum[this.activeIndex],departCode:this.queryParam.departCode,year:this.queryParam.year}).then(res => {
         if (res.success) {
           let dataSource = res.result
           this.initColumns(res.result)
@@ -327,6 +332,7 @@ export default {
   position: relative;
   padding: 20px;
   box-sizing: border-box;
+  min-width: 650px;
   width: 100%;
 }
 
@@ -410,4 +416,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.year {
+  margin-left: 6px;
+  cursor: pointer;
+}
 </style>
\ No newline at end of file