update

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

@@ -17,7 +17,9 @@
     </div>
     <div nz-col nzSpan="10" class="search-input text-right">
         <input (keyup.enter)="search('')" type="text" nz-input [(ngModel)]="searchName" placeholder="输入资源名称">
-        <button (click)="search('')" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
+        <button (click)="search('')" nz-button nzType="default"><i class="anticon anticon-search"
+                                                                   style="color: #6097b7"></i>搜索
+        </button>
     </div>
     <div nz-col nzSpan="2" class="text-right">
         <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
@@ -56,9 +58,13 @@
         <button nz-button nzType="default" (click)="showGroupModal()" *ngIf="selectedValue == 'group'">
             <i class="anticon anticon-plus-circle-o"></i>添加分组
         </button>
-        <button (click)="openBatchHost(1,'停止')" nz-button nzType="default"><i class="anticon anticon-pause-circle-o"></i>停止监控</button>
-        <button (click)="openBatchHost(0,'开启')" nz-button nzType="default"><i class="anticon anticon-play-circle-o"></i>开启监控</button>
-        <button (click)="batchDeleteConfirm()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>删除资源</button>
+        <button (click)="openBatchHost(1,'停止')" nz-button nzType="default"><i
+                class="anticon anticon-pause-circle-o"></i>停止监控
+        </button>
+        <button (click)="openBatchHost(0,'开启')" nz-button nzType="default"><i class="anticon anticon-play-circle-o"></i>开启监控
+        </button>
+        <button (click)="batchDeleteConfirm()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>删除资源
+        </button>
     </div>
 </div>
 <nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading" [nzShowPagination]="frontPagination">
@@ -105,7 +111,8 @@
                             </ng-container>
                             <ng-container *ngIf="item.status == 0">
                                 <nz-tag *ngIf="item.maxLevel == 4 || item.maxLevel == 5" [nzColor]="color.red"></nz-tag>
-                                <nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3"  [nzColor]="color.yellow"></nz-tag>
+                                <nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3"
+                                        [nzColor]="color.yellow"></nz-tag>
                                 <nz-tag *ngIf="item.maxLevel < 2  " [nzColor]="color.green"></nz-tag>
                             </ng-container>
 
@@ -214,7 +221,8 @@
                             </ng-container>
                             <ng-container *ngIf="item.status == 0">
                                 <nz-tag *ngIf="item.maxLevel == 4 || item.maxLevel == 5" [nzColor]="color.red"></nz-tag>
-                                <nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3"  [nzColor]="color.yellow"></nz-tag>
+                                <nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3"
+                                        [nzColor]="color.yellow"></nz-tag>
                                 <nz-tag *ngIf="item.maxLevel < 2  " [nzColor]="color.green"></nz-tag>
                             </ng-container>
 
@@ -281,7 +289,8 @@
                                         <li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
                                         <li (click)="openHost(item)" nz-menu-item><a>
                                             <ng-container *ngIf="item.status == 1">开启</ng-container>
-                                            <ng-container *ngIf="item.status == 0">停止</ng-container>监控
+                                            <ng-container *ngIf="item.status == 0">停止</ng-container>
+                                            监控
                                         </a></li>
                                         <li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li>
                                         <li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li>
@@ -368,7 +377,8 @@
                             <li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
                             <li (click)="openHost(item)" nz-menu-item><a>
                                 <ng-container *ngIf="item.status == 1">开启</ng-container>
-                                <ng-container *ngIf="item.status == 0">停止</ng-container>监控
+                                <ng-container *ngIf="item.status == 0">停止</ng-container>
+                                监控
                             </a></li>
                             <li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li>
                             <li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li>

src/main/webapp/app/work/work-handle/work-handle.component.html

@@ -22,14 +22,14 @@
   <div nz-col nzSpan="3">
     <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增事件</button>
   </div>
-  <div nz-col nzSpan="3">
+  <div nz-col nzSpan="2">
     <nz-select style="width: 100%;" [(ngModel)]="obj.type" nzPlaceHolder="事件分类">
       <ng-container *ngFor="let item of eventTypeList">
         <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
       </ng-container>
     </nz-select>
   </div>
-  <div nz-col nzSpan="3">
+  <div nz-col nzSpan="2">
     <nz-select style="width: 100%;"  [(ngModel)]="obj.status" nzPlaceHolder="事件状态">
         <nz-option nzLabel="待处理" nzValue="0"></nz-option>
         <nz-option nzLabel="已结束" nzValue="1"></nz-option>
@@ -56,6 +56,9 @@
   <div nz-col nzSpan="4">
     <input type="text" nz-input [(ngModel)]="obj.searchStr" placeholder="事件编号/处理人">
   </div>
+  <div nz-col nzSpan="2">
+    <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
+  </div>
 </div>
 
 <nz-table #nzTable [nzData]="eventList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)">

src/main/webapp/content/css/documentation.css

@@ -27,7 +27,7 @@
     border-top: 1px solid #dddddd;
 }
 .search-form .ant-input{
-    width: initial;
+    width: 100%;
 }
 .search-input .ant-input{
     width: 60%;