Merge remote-tracking branch 'origin/master'

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

@@ -29,19 +29,19 @@
     </div>
     <div class="releative" #checkEle>
         <div #colorEle class="checkTags tag-form">
-            <span (click)="getCheckList(0)">
+            <span (click)="getCheckList('正常')">
                 <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 (click)="getCheckList(1)"> <nz-tag [nzColor]="color.yellow"></nz-tag>
+            <span (click)="getCheckList('告警')"> <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 (click)="getCheckList(2)"> <nz-tag [nzColor]="color.red"></nz-tag>
+            <span (click)="getCheckList('严重')"> <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 (click)="getCheckList(3)"> <nz-tag [nzColor]="color.gray"></nz-tag>
+            <span (click)="getCheckList('禁用')"> <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>

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

@@ -655,7 +655,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
             obj:{
                 applicationid: this.applicationId,
                 hostid: this.hostId,
-                state:state
+                priorityName:state
             }
         };
         this.overAllSer.findCheckByType(data).subscribe(