From c8943133bd9829216a117cfff19ca609fcad2d4e Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Fri, 17 Dec 2021 15:43:25 +0800
Subject: [PATCH] =?UTF-8?q?[web-app]=20=E5=A2=9E=E5=8A=A0=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alert/alert-center/alert-center.component.html   |  3 +++
 .../alert/alert-center/alert-center.component.ts     |  4 ++++
 .../alert/alert-notice/alert-notice.component.html   | 12 +++++++++---
 .../alert/alert-notice/alert-notice.component.ts     |  6 ++++++
 .../alert/alert-setting/alert-setting.component.html |  3 +++
 .../alert/alert-setting/alert-setting.component.ts   | 11 +++++------
 .../monitor/monitor-list/monitor-list.component.html |  4 +++-
 .../monitor/monitor-list/monitor-list.component.ts   |  5 +++++
 8 files changed, 38 insertions(+), 10 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 2b70a0e..69a192b 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,6 +17,9 @@
   <i nz-icon nzType="delete" nzTheme="outline"></i>
   删除告警
 </button>
+<button nz-button nzType="primary" (click)="sync()">
+  <i nz-icon nzType="sync" nzTheme="outline"></i>
+</button>
 
 <nz-table #fixedTable [nzData]="alerts"
           [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" [nzTotal]="total"
diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.ts b/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
index dc67998..0279009 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
@@ -28,6 +28,10 @@ export class AlertCenterComponent implements OnInit {
     this.loadAlertsTable();
   }
 
+  sync() {
+    this.loadAlertsTable();
+  }
+
   loadAlertsTable() {
     this.tableLoading = true;
     let alertsInit$ = this.alertSvc.getAlerts(this.pageIndex - 1, this.pageSize)
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 b4e41ea..c68410e 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,6 +19,9 @@
       <i nz-icon nzType="appstore-add" nzTheme="outline"></i>
       新增接收人
     </button>
+    <button nz-button nzType="primary" (click)="syncReceiver()">
+      <i nz-icon nzType="sync" nzTheme="outline"></i>
+    </button>
     <nz-table #fixedTable [nzData]="receivers"
               nzFrontPagination ="false"
               [nzLoading] = "receiverTableLoading"
@@ -38,7 +41,7 @@
           <span>{{ data.name}}</span>
         </td>
         <td nzAlign="center">
-          <nz-tag *ngIf="data.type == 0" nzColor="red">
+          <nz-tag *ngIf="data.type == 0" nzColor="orange">
             <i nz-icon nzType="notification" nzTheme="outline"></i>
             <span>短信</span>
           </nz-tag>
@@ -46,11 +49,11 @@
             <i nz-icon nzType="notification" nzTheme="outline"></i>
             <span>邮件</span>
           </nz-tag>
-          <nz-tag *ngIf="data.type == 2" nzColor="yellow">
+          <nz-tag *ngIf="data.type == 2" nzColor="orange">
             <i nz-icon nzType="notification" nzTheme="outline"></i>
             <span>WebHook</span>
           </nz-tag>
-          <nz-tag *ngIf="data.type == 3" nzColor="yellow">
+          <nz-tag *ngIf="data.type == 3" nzColor="orange">
             <i nz-icon nzType="notification" nzTheme="outline"></i>
             <span>微信公众号</span>
           </nz-tag>
@@ -79,6 +82,9 @@
       <i nz-icon nzType="appstore-add" nzTheme="outline"></i>
       新增通知策略
     </button>
+    <button nz-button nzType="primary" (click)="syncRule()">
+      <i nz-icon nzType="sync" nzTheme="outline"></i>
+    </button>
     <nz-table #ruleFixedTable [nzData]="rules"
               nzFrontPagination ="false"
               [nzLoading] = "ruleTableLoading"
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 ea6e00a..93b2dc6 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
@@ -27,6 +27,12 @@ export class AlertNoticeComponent implements OnInit {
     this.loadReceiversTable();
     this.loadRulesTable();
   }
+  syncReceiver() {
+    this.loadReceiversTable();
+  }
+  syncRule() {
+    this.loadRulesTable();
+  }
 
   loadReceiversTable() {
     this.receiverTableLoading = true;
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 cc779bc..79c7d6e 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,6 +25,9 @@
   <i nz-icon nzType="delete" nzTheme="outline"></i>
   删除
 </button>
+<button nz-button nzType="primary" (click)="sync()">
+  <i nz-icon nzType="sync" nzTheme="outline"></i>
+</button>
 
 <nz-table #fixedTable [nzData]="defines"
           [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" [nzTotal]="total"
diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
index 8bc7651..86f4787 100644
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import {NzTableQueryParams} from "ng-zorro-antd/table";
-import {ActivatedRoute, Router} from "@angular/router";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {NzNotificationService} from "ng-zorro-antd/notification";
-import {NzMessageService} from "ng-zorro-antd/message";
 import {AlertDefineService} from "../../../service/alert-define.service";
 import {AlertDefine} from "../../../pojo/AlertDefine";
 import {finalize, map} from "rxjs/operators";
@@ -23,11 +21,8 @@ import {Monitor} from "../../../pojo/Monitor";
 })
 export class AlertSettingComponent implements OnInit {
 
-  constructor(private route: ActivatedRoute,
-              private router: Router,
-              private modal: NzModalService,
+  constructor(private modal: NzModalService,
               private notifySvc: NzNotificationService,
-              private msg: NzMessageService,
               private appDefineSvc: AppDefineService,
               private monitorSvc: MonitorService,
               private alertDefineSvc: AlertDefineService) { }
@@ -59,6 +54,10 @@ export class AlertSettingComponent implements OnInit {
       })
   }
 
+  sync() {
+    this.loadAlertDefineTable();
+  }
+
   loadAlertDefineTable() {
     this.tableLoading = true;
     let alertDefineInit$ = this.alertDefineSvc.getAlertDefines(this.pageIndex - 1, this.pageSize)
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 d87195e..2262de0 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
@@ -12,7 +12,6 @@
   </nz-breadcrumb-item>
 </nz-breadcrumb>
 <nz-divider></nz-divider>
-
 <button nz-button nzType="primary">
   <a routerLink="/monitors/new" [queryParams]="{app: app}">
     <i nz-icon nzType="appstore-add" nzTheme="outline"></i>
@@ -35,6 +34,9 @@
   <i nz-icon nzType="down-circle" nzTheme="outline"></i>
   取消纳管
 </button>
+<button nz-button nzType="primary" (click)="sync()">
+  <i nz-icon nzType="sync" nzTheme="outline"></i>
+</button>
 
 <nz-table #fixedTable [nzData]="monitors"
           [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" [nzTotal]="total"
diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
index a1c13a4..074092b 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
@@ -42,7 +42,12 @@ export class MonitorListComponent implements OnInit {
       });
   }
 
+  sync() {
+    this.loadMonitorTable();
+  }
+
   loadMonitorTable() {
+    this.tableLoading = true;
     let monitorInit$ = this.monitorSvc.getMonitors(this.app, this.pageIndex - 1, this.pageSize)
       .subscribe(message => {
         this.tableLoading = false;