diff --git a/nezha-fronted/src/components/common/clickSearch.vue b/nezha-fronted/src/components/common/clickSearch.vue index 3b3c215aa..a469a2e3b 100644 --- a/nezha-fronted/src/components/common/clickSearch.vue +++ b/nezha-fronted/src/components/common/clickSearch.vue @@ -66,7 +66,7 @@ export default { deep: true, handler (n) { console.log(n) - this.$emit('reload', this.selectValue) + this.$emit('reload', this.selectValueOut) } } }, diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index a7ddf2452..bf60b0d51 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -28,7 +28,8 @@ export default { scrollbarWrap: null, delFlag: false, fromBottom: false, - operationWidth: '165' // 操作列宽 + operationWidth: '165', // 操作列宽 + searchCheckBox: {} } }, methods: { @@ -66,7 +67,7 @@ export default { this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) this.tools.loading = true - this.$get(this.url, this.searchLabel).then(response => { + this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => { this.tools.loading = false if (response.code === 200) { for (let i = 0; i < response.data.list.length; i++) { diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 02dda29c4..745ddda23 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -203,7 +203,7 @@ export default { ...this.titleSearch } this.tools.loading = true - this.$get(this.url, params).then(response => { + this.$get(this.url, { ...params, ...this.searchCheckBox }).then(response => { this.tools.loading = false if (response.code === 200) { for (let i = 0; i < response.data.list.length; i++) { @@ -220,7 +220,11 @@ export default { } }) }, - reloadTable () { + reloadTable (obj) { + Object.keys(obj).forEach(key => { + this.searchCheckBox[key] = obj[key].join(',') + }) + console.log(obj, this.searchCheckBox) this.getTableData() }, getTitleSearch () {