Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/task/Index.vue

@@ -107,7 +107,7 @@ export default {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description
-          this.searchForm.reportYear = data.year
+          // this.searchForm.reportYear = data.year
           this.getListByPage()
         }
       }).catch(() => { })
@@ -130,7 +130,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ reportYear: this.searchForm.reportYear });
-      this.$api.task.getCount(pars).then(({ data = {} }) => {
+      this.$api.task.getCount({}).then(({ data = {} }) => {
         if (data) {
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
         }