From bfc646d3a39471f48d04955a8e66449b0526a825 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 29 Jul 2021 14:50:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2loading=20=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/business/complex-table/index.vue | 1 -
 frontend/src/views/system/task/DatasetTaskList.vue       | 2 +-
 frontend/src/views/system/task/TaskRecord.vue            | 3 +--
 frontend/src/views/system/task/dataset.vue               | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/business/complex-table/index.vue b/frontend/src/components/business/complex-table/index.vue
index 52fcb5e906..c4b20dddff 100644
--- a/frontend/src/components/business/complex-table/index.vue
+++ b/frontend/src/components/business/complex-table/index.vue
@@ -75,7 +75,6 @@ export default {
   },
   methods: {
     search(condition, e) {
-      console.log(condition)
       if (condition) {
         this.condition = condition
       }
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index c6da2df83b..c07cffd1a8 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -1,6 +1,6 @@
 <template>
   <el-col>
-    <el-row style="margin-top: 10px;">
+    <el-row style="margin-top: 10px;" v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
       <complex-table :data="data" :columns="columns" local-key="datasetTask" :transCondition="transCondition" :search-config="searchConfig" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
         <template #toolbar>
           <el-button icon="el-icon-circle-plus-outline" @click="selectDataset">{{ $t('dataset.task.create') }}</el-button>
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index 0adc1d0db6..15e24d6244 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -1,6 +1,6 @@
 <template>
   <el-col>
-    <el-row style="margin-top: 10px;">
+    <el-row style="margin-top: 10px;" v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
       <complex-table :data="data" :columns="columns" local-key="datasetTaskRecord" :search-config="searchConfig" :transCondition="transCondition" :pagination-config="paginationConfig" @select="select" @search="search" @sort-change="sortChange">
         <el-table-column prop="name" :label="$t('dataset.task_name')">
           <template slot-scope="scope">
@@ -122,7 +122,6 @@ export default {
   computed: {
   },
   created() {
-    console.log(this.param)
     if (this.param !== null && this.param.taskId) {
       this.matchLogId = this.param.logId || this.matchLogId
       this.transCondition['dataset_table_task.id'] = {
diff --git a/frontend/src/views/system/task/dataset.vue b/frontend/src/views/system/task/dataset.vue
index 872b0efc29..b3aa8129f3 100644
--- a/frontend/src/views/system/task/dataset.vue
+++ b/frontend/src/views/system/task/dataset.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <layout-content>
 
     <el-row style="height: 100%;width: 100%;">
       <el-tabs v-model="tabActive" @tab-click="changeTab">