From eda23b3751229309bb48156cf341aef248036390 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Sat, 18 Dec 2021 19:29:12 +0800 Subject: [PATCH] =?UTF-8?q?[web-app]=20=E6=8C=89=E9=92=AE=E6=8F=90?= =?UTF-8?q?=E7=A4=BATooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alert-center/alert-center.component.html | 4 ++-- .../alert-notice/alert-notice.component.html | 12 +++++----- .../alert-notice/alert-notice.component.ts | 24 +++++++++++++++++++ .../alert-setting.component.html | 8 +++---- .../monitor-edit/monitor-edit.component.html | 24 +++++++++++++------ .../monitor-list/monitor-list.component.html | 10 ++++---- .../monitor-new/monitor-new.component.html | 22 ++++++++++++----- 7 files changed, 74 insertions(+), 30 deletions(-) diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.html b/web-app/src/app/routes/alert/alert-center/alert-center.component.html index 69a192b..3d96648 100644 --- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html +++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html @@ -17,7 +17,7 @@ 删除告警 - @@ -67,7 +67,7 @@ {{ data.content }} {{ data.gmtCreate }} - diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 1335d8c..41c3f7e 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -19,7 +19,7 @@ 新增接收人 - {{ data.gmtUpdate? data.gmtUpdate : data.gmtCreate }} - - @@ -82,7 +82,7 @@ 新增通知策略 - {{ data.gmtUpdate? data.gmtUpdate : data.gmtCreate }} - - diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts index 93b2dc6..47b099f 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts @@ -5,6 +5,7 @@ import {NoticeRuleService} from "../../../service/notice-rule.service"; import {NoticeReceiver} from "../../../pojo/NoticeReceiver"; import {finalize} from "rxjs/operators"; import {NoticeRule} from "../../../pojo/NoticeRule"; +import {NzModalService} from "ng-zorro-antd/modal"; @Component({ selector: 'app-alert-notice', @@ -16,6 +17,7 @@ export class AlertNoticeComponent implements OnInit { constructor(private notifySvc: NzNotificationService, private noticeReceiverSvc: NoticeReceiverService, + private modal: NzModalService, private noticeRuleSvc : NoticeRuleService) { } receivers!: NoticeReceiver[]; @@ -70,6 +72,17 @@ export class AlertNoticeComponent implements OnInit { } onDeleteOneNoticeReceiver(receiveId : number) { + this.modal.confirm({ + nzTitle: '请确认是否删除!', + nzOkText: '确定', + nzCancelText: '取消', + nzOkDanger: true, + nzOkType: "primary", + nzOnOk: () => this.deleteOneNoticeReceiver(receiveId) + }); + } + + deleteOneNoticeReceiver(receiveId : number) { const deleteReceiver$ = this.noticeReceiverSvc.deleteReceiver(receiveId) .pipe(finalize(() => { deleteReceiver$.unsubscribe(); @@ -87,6 +100,17 @@ export class AlertNoticeComponent implements OnInit { } onDeleteOneNoticeRule(ruleId : number) { + this.modal.confirm({ + nzTitle: '请确认是否删除!', + nzOkText: '确定', + nzCancelText: '取消', + nzOkDanger: true, + nzOkType: "primary", + nzOnOk: () => this.deleteOneNoticeRule(ruleId) + }); + } + + deleteOneNoticeRule(ruleId : number) { const deleteRule$ = this.noticeRuleSvc.deleteNoticeRule(ruleId) .pipe(finalize(() => { deleteRule$.unsubscribe(); diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html index 79c7d6e..1e2b2f2 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html @@ -25,7 +25,7 @@ 删除 - @@ -86,13 +86,13 @@ {{ data.gmtUpdate? data.gmtUpdate : data.gmtCreate }} - - - diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html index 000ca87..a0084da 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html @@ -23,15 +23,19 @@
- 监控Host + + 监控Host + - 监控名称 + + 监控名称 + - + @@ -116,23 +120,29 @@ - 采集间隔 + + 采集间隔 + + name="intervals" id="intervals"> - 启动探测 + + 是否探测 + - 描述备注 + + 描述备注 + diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html index 2262de0..739e9e3 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html @@ -34,7 +34,7 @@ 取消纳管 - @@ -97,16 +97,16 @@ {{ data.gmtUpdate? data.gmtUpdate : data.gmtCreate }} - - - - diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html index 20edc80..b71963b 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html @@ -23,14 +23,18 @@
- 监控Host + + 监控Host + - 监控名称 + + 监控名称 + @@ -117,23 +121,29 @@ - 采集间隔 + + 采集间隔 + + name="intervals" id="intervals"> - 启动探测 + + 是否探测 + - 描述备注 + + 描述备注 +