From a2db13b00f0ca0e8eb28d5f5c4f7be860b956ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Thu, 21 Apr 2022 18:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BA=8B=E4=BB=B6UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/farm/event.js          |  9 +++++++++
 src/views/farm/event/index.vue | 30 ++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/api/farm/event.js b/src/api/farm/event.js
index a9a4cc5..46c1143 100644
--- a/src/api/farm/event.js
+++ b/src/api/farm/event.js
@@ -43,6 +43,15 @@ export function getEventPage(query) {
   })
 }
 
+// 搜索条件获得农场任务事件分页
+export function getEventSearchPage(query) {
+  return request({
+    url: '/farm/event/pageSearch',
+    method: 'get',
+    params: query
+  })
+}
+
 // 导出农场任务事件 Excel
 export function exportEventExcel(query) {
   return request({
diff --git a/src/views/farm/event/index.vue b/src/views/farm/event/index.vue
index f06be40..6e02c25 100644
--- a/src/views/farm/event/index.vue
+++ b/src/views/farm/event/index.vue
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-import { createEvent, updateEvent, deleteEvent, getEvent, getEventPage, exportEventExcel } from "@/api/farm/event";
+import { createEvent, updateEvent, deleteEvent, getEvent, getEventPage, getEventSearchPage, exportEventExcel } from "@/api/farm/event";
 import ImageUpload from '@/components/ImageUpload';
 import Editor from '@/components/Editor';
 import { getProjectPage } from "@/api/farm/project";
@@ -221,6 +221,32 @@ export default {
         this.loading = false;
       });
     },
+    /** 搜索条件查询列表 */
+    getSearchList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getEventSearchPage(params).then(response => {
+        response.data.list.forEach(eve => {
+          this.projectList.forEach(project =>{
+            if(project.id == eve.projectId){
+              eve.projectId = project.name;
+            }
+          });
+          this.taskList.forEach(task =>{
+            if (task.id == eve.taskId) {
+              eve.taskId = task.name;
+            }
+          })
+        });
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -241,7 +267,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
-      this.getList();
+      this.getSearchList();
     },
     /** 重置按钮操作 */
     resetQuery() {