From 3a36dccf183713c15d27a2d18bbed2c00a2b3057 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 1 Jun 2021 15:19:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=B8=BA=E5=8F=B3=E6=BB=91=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/alertSilenceBox.vue | 444 ------------------ .../src/components/common/mixin/dataList.js | 1 + .../components/page/alert/alertMessage.vue | 7 +- .../src/components/page/alert/alertRule.vue | 7 +- .../src/components/page/asset/asset.vue | 7 +- .../page/config/template/chartTemp.vue | 1 + .../page/monitor/endpoint/endpointList.vue | 7 +- .../page/monitor/module/moduleList.vue | 7 +- .../page/monitor/project/projectList.vue | 7 +- 9 files changed, 20 insertions(+), 468 deletions(-) delete mode 100644 nezha-fronted/src/components/common/dialog/alertSilenceBox.vue diff --git a/nezha-fronted/src/components/common/dialog/alertSilenceBox.vue b/nezha-fronted/src/components/common/dialog/alertSilenceBox.vue deleted file mode 100644 index de9e6e4f8..000000000 --- a/nezha-fronted/src/components/common/dialog/alertSilenceBox.vue +++ /dev/null @@ -1,444 +0,0 @@ - - - - - diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 1a62e87bc..87c45a367 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -217,6 +217,7 @@ export default { this.blankSilenceObject.startAt = bus.timeFormate(bus.getOffsetTimezoneData(), 'yyyy-MM-dd hh:mm:ss') this.blankSilenceObject.endAt = bus.timeFormate(bus.getOffsetTimezoneData(1), 'yyyy-MM-dd hh:mm:ss') this.objectSilence = JSON.parse(JSON.stringify(this.blankSilenceObject)) + this.objectSilence.name = 'Quick silence' if (type !== 'alertMessage' && type !== 'alertRule') { this.objectSilence.matchers = [ { name: type, value: row.name, regex: 0 }, diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 480f847a6..30aa59823 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -95,9 +95,8 @@ - - - + +