From bb23b439ec2f646e54f374e1557b8738b75b210b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 19 Jun 2023 15:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B9=B4=E5=BA=A6=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/dashboard/index.vue          |  2 +-
 .../views/supervisionNew/basicGoalDept.vue    | 37 ++++++-------------
 client/src/views/supervisionNew/task.vue      |  4 +-
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index 4dd59f3..b7cdf9b 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -122,7 +122,7 @@
             <span>质量风险管理库</span>
           </div>
           <p>
-            <el-link href="/media/default/集团公司基础质量风险管理库.wlsx" target="_blank" type="primary">集团公司基础质量风险管理库.wlsx</el-link>
+            <el-link href="/media/default/集团公司基础质量风险管理库.xlsx" target="_blank" type="primary">集团公司基础质量风险管理库.xlsx</el-link>
           </p>
           <p>
             <el-link href="/media/default/基础质量风险管理库引用文件.rar" target="_blank" type="primary">基础质量风险管理库引用文件.rar</el-link>
diff --git a/client/src/views/supervisionNew/basicGoalDept.vue b/client/src/views/supervisionNew/basicGoalDept.vue
index c51db61..bb7a428 100644
--- a/client/src/views/supervisionNew/basicGoalDept.vue
+++ b/client/src/views/supervisionNew/basicGoalDept.vue
@@ -3,35 +3,19 @@
         <el-card>
             <div>
                 <el-date-picker
-                    v-model="listQuery.search"
+                    v-model="listQuery.year"
                     type="year"
                     placeholder="选择年"
-                    value-format="yyyy"
                     style="width:300px"
+                    @change="yearChange"
                 >
                 </el-date-picker>
-                <!-- <el-select
-                    v-model="listQuery.cycle"
-                    placeholder="类型"
-                    clearable
-                    style="width: 300px"
-                    @change="handleFilter"
-                >
-                    <el-option label="目标定制" value="10"/>
-                    <el-option label="日常监督" value="20"/>
-                </el-select> -->
                 <el-button
                     class="filter-item"
                     type="primary"
                     icon="el-icon-search"
                     @click="handleFilter"
                 >搜索</el-button>
-                <el-button
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-refresh-left"
-                    @click="resetFilter"
-                >重置</el-button>
             </div>
         </el-card>
         <el-card style="margin-top: 10px">
@@ -117,13 +101,15 @@
             //获取任务列表===》获取任务id
             getList(){
                 let that = this;
+                that.dataList.results = [];
+                that.dataList.count =0;
                 that.listLoading = true;
                 if(that.listQuery.year==''){
-                    that.listQuery.year = new Date().getFullYear();
+                    let date = new Date();
+                    that.listQuery.year = date.getFullYear()+'';
                 }
                 that.listQuery.page=0;
                 getPgoalDeptList(that.listQuery).then((res) => {
-                    debugger;
                     if (res.data) {
                         let data0 = res.data;
                         let data =data0.filter(item=>{
@@ -136,7 +122,6 @@
                                 {year:that.listQuery.year,dept_name:'集团',dept:'000',pgoal_1:'',pgoal_2:'',pgoal_3:'',pgoal_4:'',pgoal_5:''}
                             ];
                             for(let i=0;i<data.length;i++){
-                                debugger;
                                 let index = alreadyId.indexOf(data[i].belong_dept)
                                 if(index>-1){
                                 }else{
@@ -163,16 +148,18 @@
                                 }
                             }
                             that.dataList.results = dataList;
-                            that.listLoading = false;
                         }
+                        that.listLoading = false;
+                    }else{
+                        that.listLoading = false;
                     }
                     
                 });
                 
             },
-            resetFilter(){
-                this.listQuery.search = '';
-                this.getList();
+            yearChange(value){
+                let year = new Date(value).getFullYear()+'';
+                this.listQuery.year = year;
             },
             handleFilter(){
                 this.getList();
diff --git a/client/src/views/supervisionNew/task.vue b/client/src/views/supervisionNew/task.vue
index 5fc34aa..77b9c98 100644
--- a/client/src/views/supervisionNew/task.vue
+++ b/client/src/views/supervisionNew/task.vue
@@ -3,7 +3,7 @@
         <el-card>
             <div>
                 <el-input
-                    v-model="listQuery.search"
+                    v-model="listQuery.year"
                     placeholder="请输入年份"
                     style="width: 300px"
                     class="filter-item"
@@ -176,7 +176,7 @@
                 },
                 listQuery:{
                     page: 1,
-                    search:'',
+                    year:'',
                     page_size: 20,
                 },
                 typeOptions:{