From ba36439ac7d3b20798508700109587806ac9f62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Thu, 16 Dec 2021 20:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E6=AC=A1=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/drinking-water/statistic/city/base.vue      | 1 +
 .../drinking-water/statistic/components/citySearch.vue      | 6 +++++-
 .../drinking-water/statistic/components/countySearch.vue    | 6 +++++-
 .../statistic/components/countySideSeatch.vue               | 6 +++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue
index 44dd5e6..ec22536 100644
--- a/src/views/water/drinking-water/statistic/city/base.vue
+++ b/src/views/water/drinking-water/statistic/city/base.vue
@@ -11,6 +11,7 @@
         @filterColumns="changeFilter"
         :visiable="visiable"
         :loading="loading"
+        :loadSearch="true"
       />
       <!-- 表格 -->
       <ele-pro-table
diff --git a/src/views/water/drinking-water/statistic/components/citySearch.vue b/src/views/water/drinking-water/statistic/components/citySearch.vue
index 1df666d..d589b57 100644
--- a/src/views/water/drinking-water/statistic/components/citySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/citySearch.vue
@@ -130,6 +130,9 @@ export default {
     },
     visiable:{
         typeof:Boolean
+    },
+    loadSearch:{
+        typeof:Boolean
     }
   },
   data() {
@@ -199,7 +202,8 @@ export default {
     // 根据父级传回来需要去掉勾的值映射到复选框
     this.initFilter(this.filterKeys);
     // 将父级回传的搜索条件上传父级进行页面搜索
-    this.emitData(true)
+    let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) || this.loadSearch;
+    this.emitData(isSearch)
 
   },
   methods: {
diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue
index 766b71d..587b7a7 100644
--- a/src/views/water/drinking-water/statistic/components/countySearch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySearch.vue
@@ -130,6 +130,9 @@ export default {
     },
     visiable:{
         typeof:Boolean
+    },
+    loadSearch:{
+        typeof:Boolean
     }
   },
   data() {
@@ -199,7 +202,8 @@ export default {
     // 根据父级传回来需要去掉勾的值映射到复选框
     this.initFilter(this.filterKeys);
     // 将父级回传的搜索条件上传父级进行页面搜索
-    this.emitData(true)
+    let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) || this.loadSearch;
+    this.emitData(isSearch)
 
   },
   methods: {
diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
index 25beed7..f6e3c27 100644
--- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
+++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue
@@ -130,6 +130,9 @@ export default {
     },
     visiable:{
         typeof:Boolean
+    },
+    loadSearch:{
+        typeof:Boolean
     }
   },
   data() {
@@ -199,7 +202,8 @@ export default {
     // 根据父级传回来需要去掉勾的值映射到复选框
     this.initFilter(this.filterKeys);
     // 将父级回传的搜索条件上传父级进行页面搜索
-    this.emitData(true)
+    let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) || this.loadSearch;
+    this.emitData(isSearch)
 
   },
   methods: {