From 36d95ae42d4ea4e035fb81a2e8e17ca85550d81a Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 16 Sep 2020 14:59:27 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-396=20feat:panel=E6=96=B0=E5=A2=9E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA(=E5=BE=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=81=94=E8=B0=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/exportXLSX.vue | 4 ++++ .../src/components/page/dashboard/panel.vue | 20 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue index 351e221ac..4723a3cbd 100644 --- a/nezha-fronted/src/components/common/exportXLSX.vue +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -135,6 +135,8 @@ url = "/endpoint/cancelImport"; } else if (this.importUrl.indexOf("rule") > -1) { url = "/alert/rule/cancelImport"; + } else if(this.importUrl.indexOf("panel") > -1){ + url = "/panel/cancelImport"; } this.$delete(url + '?seq='+this.importResult.seq).then(response=>{ if(response.code == 200 ){ @@ -186,6 +188,8 @@ url = "/asset/template"; } else if (this.importUrl.indexOf("rule") > -1) { url = "/alert/rule/template"; + } else if (this.importUrl.indexOf('panel') > -1){ + url = "/panel/template"; } let param={language:language} diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index dbc4bc4a1..d67f0dbb7 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -50,10 +50,20 @@ - + + + @@ -83,6 +93,7 @@ import timePicker from '../../common/timePicker' import draggable from 'vuedraggable' import pickTime from "../../common/pickTime"; + import exportXLSX from "../../common/exportXLSX"; export default { name: "panel", data() { @@ -162,6 +173,7 @@ 'time-picker':timePicker, draggable, 'pick-time':pickTime, + 'export-excel':exportXLSX, }, methods: { //刷新