From 7a2b20b3483cb548452694205744d5c6b47829fa Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 2 Mar 2023 11:34:42 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2625=20fix=EF=BC=9A=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=87=BA=E7=8E=B0=20panel=20?= =?UTF-8?q?=E6=88=96=20chart=20=E6=96=B0=E5=BB=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/popBox/topToolMoreOptions.vue | 5 ++++- nezha-fronted/src/components/page/alert/alertRule.vue | 3 +++ nezha-fronted/src/components/page/asset/asset.vue | 6 ++++++ nezha-fronted/src/components/page/config/agent.vue | 6 ++++++ nezha-fronted/src/components/page/config/dc.vue | 3 +++ nezha-fronted/src/components/page/dashboard/panel.vue | 4 +++- .../src/components/page/monitor/endpoint/endpointList.vue | 6 ++++++ .../src/components/page/monitor/module/moduleList.vue | 3 +++ nezha-fronted/src/components/page/monitor/project/index.vue | 3 +++ 9 files changed, 37 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index cc02744c7..c2dda5323 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -329,6 +329,7 @@ export default { { name: 'JSON', value: 3 } ], suffix: '.xlsx', + faildSuffix: '.xlsx', panel: {}, rightBox: { // 面板弹出框相关 panel: { show: false }, @@ -355,6 +356,8 @@ export default { this.importFileList = [fileList[fileList.length - 1]] } this.importFile = this.importFileList[0] + const arr = this.importFile.name.split('.') + this.faildSuffix = '.' + arr[arr.length - 1] // 获取文件后缀名 this.validateFile() }, validateFile () { @@ -688,7 +691,7 @@ export default { const blob = new Blob([uInt8Array]) link.style.display = 'none' link.href = URL.createObjectURL(blob) - link.setAttribute('download', 'failed_records' + '-' + this.getTimeString() + '.json') + link.setAttribute('download', 'failed_records' + '-' + this.getTimeString() + this.faildSuffix) document.body.appendChild(link) link.click() document.body.removeChild(link) diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index 8379eb3a5..be97724cf 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -471,6 +471,9 @@ export default { if (add) { if (add === 'alertRule') { this.add() + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 68283556d..20f6f36fd 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -1007,11 +1007,17 @@ export default { if (add) { if (add === 'asset') { this.add() + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } if (importAsset) { this.$nextTick(() => { this.$refs.export.showImportBox(1) + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.importAsset + this.$router.replace({ query: newQuery }) }) } } diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index bb6cd1f30..521b7473d 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -312,10 +312,16 @@ export default { if (add) { if (add === 'agent') { this.add() + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } if (download) { this.toDownloadAgent() + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.download + this.$router.replace({ query: newQuery }) } } } diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index e31895c50..9046fccf9 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -312,6 +312,9 @@ export default { if (add === 'cabinet') { this.addCabinet() } + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } }, diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 0713be3ce..51cd0fb34 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -1224,8 +1224,10 @@ export default { this.addChartBefore() } if (add === 'panel') { - this.toAdd() } + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } }) } diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 9134e551d..82ff67a31 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -985,10 +985,16 @@ export default { if (add === 'endpoint') { this.add() } + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } if (importEndpoint) { this.$nextTick(() => { this.$refs.export.showImportBox(1) + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.importEndpoint + this.$router.replace({ query: newQuery }) }) } } diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue index 0993834bd..cd5317c13 100644 --- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue +++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue @@ -590,6 +590,9 @@ export default { if (add === 'module') { this.add() } + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } } diff --git a/nezha-fronted/src/components/page/monitor/project/index.vue b/nezha-fronted/src/components/page/monitor/project/index.vue index 75a2025c6..3b2b05745 100644 --- a/nezha-fronted/src/components/page/monitor/project/index.vue +++ b/nezha-fronted/src/components/page/monitor/project/index.vue @@ -35,6 +35,9 @@ export default { this.$refs.dataList.add() }) } + const newQuery = JSON.parse(JSON.stringify(this.$route.query)) // 深拷贝 + delete newQuery.add + this.$router.replace({ query: newQuery }) } } }