From 57f06c050d647a728e862b4e6b5bfddada2bdd6b Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 27 Dec 2021 15:41:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=20asset=EF=BC=8Calert?= =?UTF-8?q?Message=EF=BC=8Cendpoint=20=E8=B7=AF=E7=94=B1=20url=20path=20?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=94=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/alert/alertMessage.vue | 4 +++- nezha-fronted/src/components/page/asset/asset.vue | 9 ++++++--- .../components/page/monitor/endpoint/endpointList.vue | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 20c7e3016..613a2c3b7 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -735,7 +735,9 @@ export default { ...this.searchCheckBox } const path = this.fromRoute.alertMessage - this.updatePath(param, path) + const routePathParams = lodash.cloneDeep(param) + delete routePathParams.statistics + this.updatePath(routePathParams, path) this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => { this.tools.loading = false if (response.code == 200) { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 54b47e109..457a5c5fc 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -190,6 +190,7 @@ import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions' import alertSilenceBox from '@/components/common/rightBox/alertSilenceBox' import detailViewTopSearch from '@/components/common/detailView/detailViewTopSearch' import routerPathParams from '@/components/common/mixin/routerPathParams' +import lodash from 'lodash' export default { name: 'asset', @@ -698,7 +699,9 @@ export default { ...this.searchCheckBox } const path = this.fromRoute.asset - this.updatePath(assetParam, path) + const routePathParams = lodash.cloneDeep(assetParam) + delete routePathParams.statistics + this.updatePath(routePathParams, path) this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => { this.tools.loading = false if (response.code === 200) { @@ -820,9 +823,9 @@ export default { }, jsonKey: 'val' }, - statistics: { + stateIds: { target: this.searchLabel, - propertyName: 'statistics', + propertyName: 'stateIds', type: 'number', isSearchInput: true, defaultJson: { diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 7764a486c..ea7087ba3 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -610,6 +610,7 @@ export default { pathParam.state = this.selectValue.state delete pathParam.metricsStates delete pathParam.logsStates + delete pathParam.statistics this.updatePath({ ...pathParam }, path) this.$get(this.url, params).then(response => { this.tools.loading = false