From 4fbaaff6351ca81810b8316f794c0a1eef99ff48 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Wed, 9 Sep 2020 11:15:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20alert-rule=E7=9A=84=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=85=A5=E6=92=A4=E9=94=80=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/exportXLSX.vue | 8 ++++--- .../src/components/page/alert/config.vue | 23 +++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue index 2c07bdbdc..e78ec8cf8 100644 --- a/nezha-fronted/src/components/common/exportXLSX.vue +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -133,6 +133,8 @@ url = "/asset/cancelImport"; } else if (this.importUrl.indexOf("endpoint") > -1) { url = "/endpoint/cancelImport"; + } else if (this.importUrl.indexOf("rule") > -1) { + url = "/alert/rule/cancelImport"; } this.$delete(url + '?seq='+this.importResult.seq).then(response=>{ if(response.code == 200 ){ @@ -182,9 +184,9 @@ let url=null; if (this.importUrl.indexOf("asset") > -1) { url = "/asset/template"; - } /*else if (this.importUrl.indexOf("endpoint") > -1) { - url = "/endpoint/template"; - }*/ + } else if (this.importUrl.indexOf("rule") > -1) { + url = "/alert/rule/template"; + } let param={language:language} if(!url){ diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index d13b32580..923e2cd8f 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -12,10 +12,21 @@