网站监测

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

@@ -35,7 +35,7 @@ export class AlarmListComponent implements OnInit {
     pageCount = pageSize;
 
     //条件
-    timeType;
+    timeType = '1';
     obj = {
         priorityName:null,
         groupid:null,
@@ -50,10 +50,10 @@ export class AlarmListComponent implements OnInit {
     }
 
     ngOnInit() {
-        const obj = {};
         this.getType();
         this.getWarnGroup();
-        this.warnList.getList(obj);
+        this.changeType();
+        this.searchValue();
     }
 
     //获取分组

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

@@ -21,7 +21,10 @@
 
 <div nz-row class="search-form">
     <div nz-col nzSpan="16">
-        <span>当前告警数：{{alarmTotal}}</span>
+        <span>当前告警数：
+         <i *ngIf="!alarmTotal && alarmTotal !=0" class="anticon anticon-spin anticon-loading"  style="font-size: 15px;"></i>
+            {{alarmTotal}}
+        </span>
     </div>
 </div>
 <div class="tag-warn tag-form">

src/main/webapp/app/modal/basic-edit/basic-edit.component.ts

@@ -105,7 +105,8 @@ export class BasicEditComponent implements OnInit {
 
                 this.validateForm.groups = data.groups;
                 if(data.parentTemplates){
-                    const tempArr = data.parentTemplates.map(res=>{
+                    let tempArr = [];
+                    tempArr = data.parentTemplates.map(res=>{
                         return res.templateid;
                     });
                     this.validateForm.templates = tempArr;
@@ -247,7 +248,7 @@ export class BasicEditComponent implements OnInit {
     getTemplate() {
         this.overAllSer.templates().subscribe(
             (res) => {
-                this.tempList = res.apiResponse.data;
+                this.tempList = res.apiResponse.data.result;
             }
         );
     }
@@ -372,7 +373,7 @@ export class BasicEditComponent implements OnInit {
                 name: null,
                 serialno_a: null
             },
-            templates: [],
+            templates: null,
             name: null,
             host: null,
             ipmi_authtype: null,

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

@@ -30,10 +30,22 @@
     </div>
     <div class="releative">
         <div class="checkTags tag-form">
-            <span> <nz-tag [nzColor]="color.green"></nz-tag>{{checkStatus.normal}}</span>
-            <span> <nz-tag [nzColor]="color.yellow"></nz-tag>{{checkStatus.warning}}</span>
-            <span> <nz-tag [nzColor]="color.red"></nz-tag>{{checkStatus.high}}</span>
-            <span> <nz-tag [nzColor]="color.gray"></nz-tag>{{checkStatus.disabled}}</span>
+            <span> <nz-tag [nzColor]="color.green"></nz-tag>
+                 <i *ngIf="!checkStatus.normal && checkStatus.normal !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                {{checkStatus.normal}}
+            </span>
+            <span> <nz-tag [nzColor]="color.yellow"></nz-tag>
+                 <i *ngIf="!checkStatus.warning && checkStatus.warning !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                {{checkStatus.warning}}
+            </span>
+            <span> <nz-tag [nzColor]="color.red"></nz-tag>
+                 <i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                {{checkStatus.high}}
+            </span>
+            <span> <nz-tag [nzColor]="color.gray"></nz-tag>
+                 <i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                {{checkStatus.disabled}}
+            </span>
         </div>
         <nz-tabset  class="tabs-smart ">
 

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

@@ -66,10 +66,10 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
     checkList: any[];
     isCheck = false;
     checkStatus = {
-        warning: '0',
-        normal: '0',
-        disabled: '0',
-        high: '0'
+        warning: null,
+        normal: null,
+        disabled: null,
+        high: null
     };
 
     isKey = false;

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

@@ -31,10 +31,22 @@
     <div nz-col nzSpan="12">
         <span>监控设备数：{{deviceNo}}</span>
         <span>设备状态：
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.green"></nz-tag>{{green}} </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.yellow"></nz-tag>{{yellow}} </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.red"></nz-tag>{{red}} </span>
-      <span> <nz-tag [nzColor]="color.gray"></nz-tag>{{gray}} </span>
+      <span style="margin-right: 8px"> <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>
+          <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>
+           <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>
+            <i *ngIf="!gray && gray!=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+          {{gray}}
+      </span>
     </span>
         <nz-select style="width: 200px;" nzPlaceHolder="按组分开" [(ngModel)]="selectedValue"
                    (ngModelChange)="select()">
@@ -76,7 +88,8 @@
                     <tr *ngIf="(item.parent&&item.parent.expand)||!(item.parent)">
                         <td nzShowCheckbox [(nzChecked)]="item.checked"></td>
                         <td class="cursor" [nzIndentSize]="item.level*20" [nzShowExpand]="!!item.list"
-                            [(nzExpand)]="item.expand" (nzExpandChange)="collapse(expandDataCache[data.host],item,$event)">
+                            [(nzExpand)]="item.expand"
+                            (nzExpandChange)="collapse(expandDataCache[data.host],item,$event)">
                             <span *ngIf="!item.level" (click)="getChildrenType(item)">{{item.equipmentType}}</span>
                             <span *ngIf="item.level" (click)="goDetail(item)">{{item.name}}</span>
                         </td>
@@ -121,7 +134,7 @@
                         <!--父级-->
                         <ng-container *ngIf="!item.level">
                             <td></td>
-                            <td class="cursor" [nzIndentSize]="item.level*20" nzShowExpand [nzExpand] ='item.expand'
+                            <td class="cursor" [nzIndentSize]="item.level*20" nzShowExpand [nzExpand]='item.expand'
                                 (nzExpandChange)="getChildren(item)">
                                 <span>{{item.name}}</span>
                             </td>
@@ -222,7 +235,8 @@
     <ng-container *ngIf="searchStatus">
         <ng-container *ngFor="let item of searchData">
             <tr>
-                        <td nzShowCheckbox [nzIndeterminate]="indeterminate" (nzCheckedChange)="selectChecked($event,item)" [(nzChecked)]="item.checked"></td>
+                <td nzShowCheckbox [nzIndeterminate]="indeterminate" (nzCheckedChange)="selectChecked($event,item)"
+                    [(nzChecked)]="item.checked"></td>
                 <td class="cursor">
                     <span (click)="goDetail(item)">{{item.name}}</span>
                 </td>
@@ -303,6 +317,7 @@
     </tbody>
 </nz-table>
 
+<i class="anticon anticon-spin anticon-loading"></i>
 <!-- 添加资源-->
 <smart-basic-edit #basicEdit (done)="handleOk($event)"></smart-basic-edit>
 <!--添加监测点-->

src/main/webapp/app/overAll/network-check/network-check.component.html

@@ -26,12 +26,24 @@
 
 <div nz-row class="search-form tag-form">
     <div nz-col nzSpan="12">
-        <span>网站监测数：{{deviceNo}}</span>
+        <span>网站监测数：{{checkStatus.total}}</span>
         <span>监测状态：
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.green"></nz-tag>{{checkStatus.green}} </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.yellow"></nz-tag>{{checkStatus.yellow}} </span>
-      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.red"></nz-tag>{{checkStatus.red}} </span>
-      <span> <nz-tag [nzColor]="color.gray"></nz-tag>{{checkStatus.gray}} </span>
+      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.green"></nz-tag>
+           <i *ngIf="!checkStatus.type.normalNum && checkStatus.type.normalNum !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+          {{checkStatus.type.normalNum}}
+      </span>
+      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.yellow"></nz-tag>
+                     <i *ngIf="!checkStatus.type.warnNum && checkStatus.type.warnNum !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+          {{checkStatus.type.warnNum}}
+      </span>
+      <span style="margin-right: 8px"> <nz-tag [nzColor]="color.red"></nz-tag>
+                     <i *ngIf="!checkStatus.type.seriousNum && checkStatus.type.seriousNum !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+          {{checkStatus.type.seriousNum}}
+      </span>
+      <span> <nz-tag [nzColor]="color.gray"></nz-tag>
+                     <i *ngIf="!checkStatus.type.notNum && checkStatus.type.notNum !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+          {{checkStatus.type.notNum}}
+      </span>
     </span>
     </div>
     <div nz-col nzSpan="12" class="text-right">

src/main/webapp/app/overAll/network-check/network-check.component.ts

@@ -32,10 +32,13 @@ export class NetworkCheckComponent implements OnInit {
     totalNum;
 
     checkStatus = {
-        green: '',
-        yellow: '',
-        red: '',
-        gray: ''
+        type:{
+            seriousNum:null,
+            notNum:null,
+            warnNum:null,
+            normalNum:null
+        },
+        total:null
     };
 
     batchSelectList = [];
@@ -80,7 +83,15 @@ export class NetworkCheckComponent implements OnInit {
 
     //监测状态
     getCheckStatus() {
-
+        this.overAllSer.countStatus().subscribe(
+            (res)=>{
+                if(res.errCode == 10000){
+                    this.checkStatus = res.data;
+                }else{
+                    this.message.info(res.errMsg);
+                }
+            }
+        )
     }
 
     //选中

src/main/webapp/app/overAll/overAll.service.ts

@@ -284,4 +284,9 @@ export class OverAllService {
     findAlert(data): Observable<any>{
         return this.http.post(SERVER_API_URL + '/webscenario/findAlert' ,data);
     }
+
+    //统计网站监测告警种类
+    countStatus(): Observable<any>{
+        return this.http.get(SERVER_API_URL + '/webscenario/countStatus');
+    }
 }
\ No newline at end of file