diff --git a/src/views/water/drinking-water/statistic/city/overStandard.vue b/src/views/water/drinking-water/statistic/city/overStandard.vue index 5072771..28ca624 100644 --- a/src/views/water/drinking-water/statistic/city/overStandard.vue +++ b/src/views/water/drinking-water/statistic/city/overStandard.vue @@ -8,6 +8,7 @@ :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" + :visiable="visiable" @filterColumns="changeFilter" /> @@ -56,7 +57,10 @@ export default { default: function () { return [] }, - } + }, + visiable:{ + typeof:Boolean + } }, data() { return { diff --git a/src/views/water/drinking-water/statistic/city/waterCount.vue b/src/views/water/drinking-water/statistic/city/waterCount.vue index 41a515d..716b1b7 100644 --- a/src/views/water/drinking-water/statistic/city/waterCount.vue +++ b/src/views/water/drinking-water/statistic/city/waterCount.vue @@ -6,6 +6,7 @@ { + let isSearch = (this.where.monitorStartTime && this.where.monitorEndTime) && val; + this.emitData(isSearch) + },200) } }, diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue index f6bb3e4..8ea5126 100644 --- a/src/views/water/drinking-water/statistic/components/countySearch.vue +++ b/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) } }, diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue index 54838f8..10e74f5 100644 --- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue +++ b/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) } }, diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue index 3de29fb..76414ae 100644 --- a/src/views/water/drinking-water/statistic/countryside/overStandard.vue +++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue @@ -8,6 +8,7 @@ :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" + :visiable="visiable" @filterColumns="changeFilter" /> @@ -56,7 +57,10 @@ export default { default: function () { return [] }, - } + }, + visiable:{ + typeof:Boolean + } }, data() { return { diff --git a/src/views/water/drinking-water/statistic/county/overStandard.vue b/src/views/water/drinking-water/statistic/county/overStandard.vue index 307d13e..76af50a 100644 --- a/src/views/water/drinking-water/statistic/county/overStandard.vue +++ b/src/views/water/drinking-water/statistic/county/overStandard.vue @@ -6,6 +6,7 @@