Merge branch 'yinyongshui'

src/views/water/drinking-water/statistic/city/overStandard.vue

@@ -8,6 +8,7 @@
         :filterKeys="filterKeys"
         @search="searchData"
         @exportFile="exportFile"
+        :visiable="visiable"
         @filterColumns="changeFilter"
       />
       <!-- 表格 -->
@@ -56,6 +57,9 @@ export default {
             default: function () {
                 return []
             },
+        },
+        visiable:{
+          typeof:Boolean
       }
     },
   data() {

src/views/water/drinking-water/statistic/city/waterCount.vue

@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -59,6 +60,9 @@ export default {
             default: function () {
                 return []
             },
+        },
+        visiable:{
+          typeof:Boolean
       }
     },
   data() {

src/views/water/drinking-water/statistic/components/citySearch.vue

@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+         window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 

src/views/water/drinking-water/statistic/components/countySearch.vue

@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+         window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 

src/views/water/drinking-water/statistic/components/countySideSeatch.vue

@@ -174,8 +174,10 @@ export default {
     },
     // 监听组件显示
     visiable(val){
-      console.log('change',val)
-      this.emitData(val)
+      window.setTimeout(()=>{
+        let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val;
+        this.emitData(isSearch)
+      },200)
     }
   },
 

src/views/water/drinking-water/statistic/countryside/overStandard.vue

@@ -8,6 +8,7 @@
         :filterKeys="filterKeys"
         @search="searchData"
         @exportFile="exportFile"
+        :visiable="visiable"
         @filterColumns="changeFilter"
       />
       <!-- 表格 -->
@@ -56,6 +57,9 @@ export default {
             default: function () {
                 return []
             },
+        },
+        visiable:{
+          typeof:Boolean
       }
     },
   data() {

src/views/water/drinking-water/statistic/county/overStandard.vue

@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -56,6 +57,9 @@ export default {
             default: function () {
                 return []
             },
+        },
+        visiable:{
+          typeof:Boolean
       }
     },
   data() {

src/views/water/drinking-water/statistic/county/waterCount.vue

@@ -6,6 +6,7 @@
         <search
         :searchForm="searchForm"
         :filterKeys="filterKeys"
+        :visiable="visiable"
         @search="searchData"
         @exportFile="exportFile"
         @filterColumns="changeFilter"
@@ -59,6 +60,9 @@ export default {
             default: function () {
                 return []
             },
+        },
+        visiable:{
+          typeof:Boolean
       }
     },
   data() {