Merge remote-tracking branch 'origin/Qz_daily_2.1.0' into Qz_daily_2.1.0

src/views/projectManage/taskList/taskIndex.vue

@@ -689,9 +689,13 @@ export default {
     },
     async get_chartList() {
       this.table_loading = true
-      const res = await getChartData(this.form_task)
-      this.chartData = res.data
-      this.get_chartListDetial(res.data.data[0].code)
+      // const res = await getChartData(this.form_task)
+      getChartData(this.form_task).then(res => {
+        this.chartData = res.data
+        this.get_chartListDetial(res.data.data[0].code)
+      }).catch(() => {
+        this.table_loading = false
+      })
     },
     async get_chartListDetial(code) {
       this.showChartModal = false
@@ -782,7 +786,7 @@ export default {
         this.curIndex = 1
         this.currentPage = 1
       }
-      this.table_loading = true
+      // this.table_loading = true
       this.form_task.bizId = this.bizId
       this.form_task.pageSize = this.pageSize
       this.form_task.curIndex = this.curIndex