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 @@
质量风险管理库
- 集团公司基础质量风险管理库.wlsx
+ 集团公司基础质量风险管理库.xlsx
基础质量风险管理库引用文件.rar
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 @@
-
搜索
- 重置
@@ -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-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 @@