update

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

@@ -47,8 +47,8 @@ export class AlarmLogComponent implements OnInit {
     obj = {
         time_from:<any>'',
         time_till:<any>'',
-        alertGroupId:null,
-        mediatypeids:null,
+        alertGroupId:'',
+        mediatypeids:'',
         hostids:'',
     };
 
@@ -63,7 +63,6 @@ export class AlarmLogComponent implements OnInit {
     ngOnInit() {
         this.getType();
         this.getWarnGroup();
-
         this.getList(this.obj);
     }
 
@@ -72,11 +71,11 @@ export class AlarmLogComponent implements OnInit {
         const data = {
             "eventPage":this.pageNum,
             "pageRecords":this.pageCount,
-            "alertGroupId":null,
+            "alertGroupId":this.obj.alertGroupId,
             "time_from":obj.time_from,
             "time_till":obj.time_till,
-            "mediatypeids":null,
-            "hostids":null
+            "mediatypeids":[this.obj.mediatypeids],
+            "hostids":[this.obj.hostids]
         };
         this.alarmSer.alertFind(data).subscribe(
             (res)=>{

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

@@ -14,15 +14,16 @@
     <tbody>
     <tr *ngFor="let data of logList">
       <td>{{data.subject}}</td>
-      <td>{{data.clock}}</td>
+      <td>{{data.clock | date:"yyyy-MM-dd hh:mm:ss"}}</td>
       <td>告警资源</td>
       <td>{{data.message}}</td>
-      <td>类别</td>
-      <td>资源分组</td>
-      <td>{{data.continuedTime}}</td>
-      <td>产生事件</td>
-      <td>{{data.stateName}}</td>
-      <td class="list-icon"><i class="anticon anticon-profile"></i></td>
+      <td>
+        <span *ngIf="data.status == 0">消息未发送</span>
+        <span *ngIf="data.status == 1">消息已发送</span>
+        <span *ngIf="data.status == 2">经多次重试后失败</span>
+      </td>
+      <td>{{data.mediatypes[0].description}}</td>
+      <td class="list-icon">{{data.sendto}}</td>
     </tr>
     </tbody>
   </nz-table>

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

@@ -28,11 +28,14 @@
     </div>
 </div>
 <div class="tag-warn tag-form">
-  <span *ngFor="let item of warnCountList">
+    <ng-container *ngFor="let item of warnCountList">
+        <span (click)="search()">
     <nz-tag *ngIf="item.level == 4 || item.level == 5" [nzColor]="color.red"></nz-tag>
     <nz-tag *ngIf="item.level == 2 || item.level == 3" [nzColor]="color.yellow"></nz-tag>
     {{item.name}}({{item.size}})
   </span>
+    </ng-container>
+
 </div>
 
 <smart-warn-list #warnList (total)="getTotal($event)"></smart-warn-list>

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

@@ -51,7 +51,8 @@ export class NowAlarmComponent implements OnInit {
 
     search(){
         const obj = {
-            isWaring:'yes'
+            isWaring:'yes',
+
         };
         this.warnList.getList(obj);
     }

src/main/webapp/app/modal/basi-check/basi-check.component.ts

@@ -187,6 +187,7 @@ export class BasiCheckComponent implements OnInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.isCheck = false;
+                    this.initForm();
                     this.done.emit();
                 }
                 this.message.info(res.errMsg);
@@ -203,6 +204,7 @@ export class BasiCheckComponent implements OnInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.isCheck = false;
+                    this.initForm();
                     this.done.emit();
                 }
                 this.message.info(res.errMsg);

src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html

@@ -160,7 +160,10 @@
                         </thead>
                         <tbody>
                         <tr *ngFor="let data of checkTable.data">
-                            <td>{{data.name}}</td>
+                            <td>
+                                <nz-tag *ngIf="data.priority == 4 || data.priority == 5" [nzColor]="color.red"></nz-tag>
+                                <nz-tag *ngIf="data.priority == 2 || data.priority == 3" [nzColor]="color.yellow"></nz-tag>
+                                {{data.name}}</td>
                             <td>{{data.lastvalue}}</td>
                             <td>{{data.lastclock}}</td>
                             <td>{{data.itemType}}</td>

src/main/webapp/app/overAll/basic/basic.component.html

@@ -31,19 +31,19 @@
     <div nz-col nzSpan="12">
         <span>监控设备数：{{deviceNo}}</span>
         <span>设备状态：
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.green"></nz-tag>
+      <span style="margin-right: 8px" (click)="search('0')"> <nz-tag [nzColor]="color.green"></nz-tag>
           <i *ngIf="!green && green !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
          {{green}}
       </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.yellow"></nz-tag>
+      <span routerLink="../nowAlarm" style="margin-right: 8px"> <nz-tag [nzColor]="color.yellow"></nz-tag>
           <i *ngIf="!yellow && yellow != 0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
           {{yellow}}
       </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.red"></nz-tag>
+      <span routerLink="../nowAlarm" style="margin-right: 8px"> <nz-tag [nzColor]="color.red"></nz-tag>
            <i *ngIf="!red && red != 0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
           {{red}}
       </span>
-      <span> <nz-tag [nzColor]="color.gray"></nz-tag>
+      <span  (click)="search('1')"> <nz-tag [nzColor]="color.gray"></nz-tag>
             <i *ngIf="!gray && gray!=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
           {{gray}}
       </span>

src/main/webapp/app/overAll/basic/basic.component.ts

@@ -134,12 +134,13 @@ export class BasicComponent implements OnInit {
     }
 
     //搜索
-    search(){
+    search(status){
         this.loading = true;
         this.searchStatus = true;
         this.frontPagination = false;
         const data = {
             search:{
+                status:status,
                 name:this.searchName
             }
         }