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() {