diff --git a/src/api/task.js b/src/api/task.js
index 12a6469..982fe9d 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -8,6 +8,7 @@ const taskDistributeTask = (params)=>putAction("/task/distributeTask",params);
 const taskDeleteById = (params)=>deleteAction("/task/deleteById",params);
 const getDataAnalysis = (params)=>getAction("/dataAnalysis/getDataAnalysis",params);
 const getTaskDataTypeAnalysis = (params)=>getAction("/dataAnalysis/getTaskDataTypeAnalysis",params);
+const getAllTask = (params)=>getAction("/task/queryAll",params);
 export {
     taskCreate,
     taskUpdateById,
@@ -16,7 +17,8 @@ export {
     taskDistributeTask,
     taskDeleteById,
     getDataAnalysis,
-    getTaskDataTypeAnalysis
+    getTaskDataTypeAnalysis,
+    getAllTask
 }
 
 
diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue
index abe34f7..fc5d87b 100644
--- a/src/views/data/dataSearch.vue
+++ b/src/views/data/dataSearch.vue
@@ -20,10 +20,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :md="4" :sm="4">
+            <a-form-item label="任务">
+              <a-select placeholder="选择任务" option-filter-prop="children" v-model="activeTaskId"
+                @change="handleTaskChange">
+                <a-select-option v-for="d in allTask" :key="d.id">
+                  {{ d.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :md="8" :sm="8">
             <a-form-item label="时间范围">
-              <a-range-picker :default-value="defaultTime" show-time :show-time="{ format: 'HH:mm:ss' }"
-                :format="dateFormat" @change="onChangeTime" />
+              <a-range-picker :default-value="defaultTime" show-time :show-time="{ format: 'HH:mm:ss' }" :format="dateFormat"
+                @change="onChangeTime" />
             </a-form-item>
           </a-col>
           <a-col :md="5" :sm="5">
@@ -31,7 +41,9 @@
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="7">
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :md="24" :sm="24" style="text-align: right;">
             <a-button @click="getTableDataList" type="primary">查询</a-button>&nbsp;
             <a-button @click="exportTool" type="primary">导出dmp</a-button>&nbsp;
             <a-button @click="handleAdd" type="primary">导出csv、txt</a-button>&nbsp;
@@ -73,11 +85,12 @@
 <script>
 import { metaDataTypeTree, tableDataList, DmExportTool } from '@/api/metaData'
 import { getAction, deleteAction, putAction, postAction, downFile } from '@/api/manage'
+import { getAllTask } from '@/api/task'
 import moment from 'moment';
 import tablelist from './modules/tablelist'
-import exptable from './modules/exptable' 
+import exptable from './modules/exptable'
 import editdataseach from './modules/editdataseach'
- 
+
 export default {
   name: "metadata",
   components: {
@@ -91,6 +104,8 @@ export default {
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
       defaultTime: [],
       loading: false,
+      allTask: [],
+      activeTaskId: null,
       // 查询条件
       queryParam: {
         sourceType: 2,
@@ -135,16 +150,42 @@ export default {
   },
   created() {
     this.getselect()
-    const start = moment()
-      .subtract(1, 'days')
-      .set({ hour: 0, minute: 0, second: 0 });
-    const end = moment()
-      .set({ hour: 23, minute: 59, second: 59 });
-    this.defaultTime = [start, end];
-    this.tableParams.startTime = start.format(this.dateFormat);
-    this.tableParams.endTime = end.format(this.dateFormat);
+    this.queryAllTask()
+    // this.initDate() 
   },
   methods: {
+    queryAllTask() {
+      getAllTask().then(res => {
+        console.log('res', res)
+        if (res.success) {
+          this.allTask = res.result
+          if (res.result.length > 0) {
+            this.activeTaskId = res.result[0].id
+
+            const start = moment(res.result[0].startTime).set({ hour: 0, minute: 0, second: 0 })
+            const end = moment(res.result[0].endTime).set({ hour: 23, minute: 59, second: 59 })
+            this.defaultTime = [start, end];
+            console.log('riq', this.defaultTime)
+            this.tableParams.startTime = start.format(this.dateFormat);
+            this.tableParams.endTime = end.format(this.dateFormat)
+
+          }
+        } else {
+          this.$message.warning(res.message);
+        }
+      })
+    },
+    handleTaskChange(value) {
+      var curTask = this.allTask.filter(item => item.id == value)
+      console.log(curTask)
+
+      const start = moment(curTask.startTime)
+      const end = moment(curTask.endTime)
+      this.defaultTime = [start, end];
+      this.tableParams.startTime = start.format(this.dateFormat);
+      this.tableParams.endTime = end.format(this.dateFormat)
+
+    },
     calculateScrollY() {
       // 获取父容器高度（需减去表格内其他元素的高度，如分页栏）
       const container = this.$refs.treeContainer;
@@ -230,9 +271,9 @@ export default {
         this.tableParams.pageNum = 1
       }
     },
-    handelEdit(record) { 
+    handelEdit(record) {
       const filteredColumn = this.columns.filter(item => item.dataIndex != 'operation');
-      this.$refs.editdataseachForm.initForm(this.tableParams.schemaMass, this.tableParams.tableName, filteredColumn ,record);
+      this.$refs.editdataseachForm.initForm(this.tableParams.schemaMass, this.tableParams.tableName, filteredColumn, record);
     },
     getTableDataList() {
       console.log(this.tableParams)