From 2e347769c9bcf4da41ed0f68ae4ac134295096e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 8 Sep 2022 13:57:47 +0800
Subject: [PATCH] up

---
 src/api/dashboard/notice.js                      |  4 ++--
 src/views/contract/components/editorContract.vue |  2 +-
 src/views/dashboard/index.vue                    | 12 +++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api/dashboard/notice.js b/src/api/dashboard/notice.js
index d1300cb..6be0d2c 100644
--- a/src/api/dashboard/notice.js
+++ b/src/api/dashboard/notice.js
@@ -16,10 +16,10 @@ export function readNotice(params){
   })
 }
 
-export function statistic(data){
+export function statistic(params){
   return request({
     method:'get',
     url:'/api/admin/notice/statistic',
-    data
+    params
   })
 }
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 9ac7cae..0f81ae5 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -219,7 +219,7 @@
         }
       }
       return {
-        userList: ["liuxiangyu", "zhushulan","admin"],
+        userList: ["liuxiangyu", "zhushulan","admin","jiangjiao"],
         user: null,
         adminEdit: false,
         isFocus: false,
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 141de95..e64dc08 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -7,6 +7,8 @@
     <el-card class="box-card" style="margin: 20px 0;">
       <div slot="header" class="clearfix">
     <span>预算总体进展情况</span>
+            <DatePicker :value="select.year"  placeholder="选择所属年份" placement="bottom" style="width: 130px;float: right;" type="year"
+                        @on-change="changeYear"></DatePicker>
   </div> <router-link :to="`/statisticalReport/budgetProgress`">
       <div class="progress-card" >
         <div class="progress-card-item">
@@ -120,6 +122,9 @@ export default {
   },
   data() {
     return {
+      select:{
+year:'2022'
+      },
       statistic:'',
       department_id: [],
       userIds: [],
@@ -235,8 +240,13 @@ export default {
     }).catch(error => {})
   },
   methods: {
+    changeYear(e){
+      this.select.year=e;
+    this.getStatistic()
+
+    },
     async getStatistic(){
-      const res = await statistic()
+      const res = await statistic(this.select)
       console.log(res)
       this.statistic = res
     },