From bc772355eb4cbb76fa245ac8be6ca2c76b85c60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Thu, 9 Dec 2021 16:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/lake/statistic/inner/component/search.vue   | 5 ++++-
 src/views/water/lake/statistic/special/component/search.vue | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/water/lake/statistic/inner/component/search.vue b/src/views/water/lake/statistic/inner/component/search.vue
index 346875a..d5901e0 100644
--- a/src/views/water/lake/statistic/inner/component/search.vue
+++ b/src/views/water/lake/statistic/inner/component/search.vue
@@ -201,7 +201,7 @@ export default {
 
     emitData(val){
       if(val && this.where.startTime && this.where.endTime){
-        this.$emit("search", this.where);
+        this.searchData();
       }
     },
 
@@ -253,9 +253,12 @@ export default {
       this.where = {
         checked: 1,
       };
+      this.filter = innerFilterColumns.map((item) => item.dataIndex);
+      this.handleOk()
       this.searchData();
     },
     searchData() {
+      this.where.filter = [...this.filter]
       this.$emit("search", this.where);
     },
     exportFile() {
diff --git a/src/views/water/lake/statistic/special/component/search.vue b/src/views/water/lake/statistic/special/component/search.vue
index 38865fd..8e8fe42 100644
--- a/src/views/water/lake/statistic/special/component/search.vue
+++ b/src/views/water/lake/statistic/special/component/search.vue
@@ -201,7 +201,7 @@ export default {
 
     emitData(val){
       if(val && this.where.startTime && this.where.endTime){
-        this.$emit("search", this.where);
+        this.searchData()
       }
     },
 
@@ -253,9 +253,13 @@ export default {
       this.where = {
         checked: 1,
       };
+      this.filter = innerFilterColumns.map((item) => item.dataIndex);
+      this.handleOk()
       this.searchData();
+      
     },
     searchData() {
+      this.where.filter = [...this.filter]
       this.$emit("search", this.where);
     },
     exportFile() {