update

src/main/webapp/app/alarm/alarm-log/alarm-log.component.html

@@ -22,14 +22,14 @@
     <div nz-col nzSpan="3">
         <nz-select style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="选择发送方式" [(ngModel)]="obj.mediatypeids">
             <ng-container *ngFor="let item of sendList">
-                <nz-option nzLabel="{{item.description}}" nzValue="{{item.mediatypeid}}"></nz-option>
+                <nz-option [nzLabel]="item.description" [nzValue]="item.mediatypeid"></nz-option>
             </ng-container>
         </nz-select>
     </div>
     <div nz-col nzSpan="3">
         <nz-select style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="选择告警组" [(ngModel)]="obj.alertGroupId">
             <ng-container *ngFor="let item of groupList;">
-                <nz-option nzLabel="{{item.name}}" nzValue="{{item.groupid}}"></nz-option>
+                <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
             </ng-container>
         </nz-select>
     </div>
@@ -61,7 +61,7 @@
     </div>
 </div>
 
-<nz-table #nzTable [nzData]="logList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)">
+<nz-table #nzTable [nzData]="logList" [nzLoading]="loading" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)">
     <thead>
     <tr>
         <th nzWidth="20%">告警名称</th>

src/main/webapp/app/alarm/alarm-log/alarm-log.component.ts

@@ -59,6 +59,7 @@ export class AlarmLogComponent implements OnInit {
     isVisible = false;
     title;
     content;
+    loading = false;
     constructor(public alarmSer: AlarmService,public overAllSer:OverAllService,public message:NzMessageService,
                 public datePipe:DatePipe,public modalSer:NzModalService) {
         const today = new Date();
@@ -68,12 +69,13 @@ export class AlarmLogComponent implements OnInit {
 
     ngOnInit() {
         this.getType();
-        this.getWarnGroup();
+        this.getGroupAlarm();
         this.getList();
     }
 
     //获取list
     getList(){
+        this.loading = true;
         const data = {
             "eventPage":this.pageNum,
             "pageRecords":this.pageCount,
@@ -97,19 +99,20 @@ export class AlarmLogComponent implements OnInit {
                 }else{
                     this.message.info(res.errMsg);
                 }
+                this.loading = false;
             }
         )
     }
 
-    //获取分组
-    getWarnGroup(){
-        this.overAllSer.findGroup().subscribe(
-            (res)=>{
-                if(res.errCode == 10000){
+    //获取告警组
+    getGroupAlarm() {
+        this.alarmSer.alertGroupFind().subscribe(
+            (res) => {
+                if (res.errCode == 10000) {
                     this.groupList = res.data;
                 }
             }
-        )
+        );
     }
 
     //获取告警组