style update

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

@@ -64,7 +64,6 @@
     <button (click)="searchValue()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
   </div>
   <div nz-col nzSpan="8" class="text-right">
-    <button [nzLoading]="isDownload" (click)="downLoadExcel()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
   </div>
 </div>
 

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

@@ -56,7 +56,6 @@
         </ng-container>
     </div>
     <div nz-col nzSpan="4" class="text-right">
-        <button [nzLoading]="isDownload" (click)="downLoadExcel()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
         <button (click)="search()"   nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
     </div>
 </div>

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

@@ -26,12 +26,12 @@
         </span>
     </div>
     <div nz-col nzSpan="8" class="text-right">
-        <button [nzLoading]="isDownload" (click)="downLoadExcel()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
+<!--        <button [nzLoading]="isDownload" (click)="downLoadExcel()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>-->
     </div>
 </div>
 <div class="tag-warn tag-form handle">
     <ng-container *ngFor="let item of warnCountList">
-        <span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search(item.hostid)">
+        <span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search()">
             <nz-tag *ngIf="item.level == 4 || item.level == 5" class="tag-red" [nzColor]="color.red"></nz-tag>
             <nz-tag *ngIf="item.level == 2 || item.level == 3" class="tag-yellow" [nzColor]="color.yellow"></nz-tag>
             {{item.name}}({{item.size}})

src/main/webapp/app/home/home.component.html

@@ -68,7 +68,7 @@
         </div>
     </div>
     <div #rightDiv nz-col nzSpan="8" class="rightDiv" style="height: 500px;">
-        <h2>设备类型></h2>
+        <h2>设备类型</h2>
         <div echarts [options]="rightTwoChart" style="height: 250px;width: 100%;margin-top: 50px"></div>
     </div>
 </div>

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -27,9 +27,9 @@
             </a>
             <ul nz-menu>
                 <li (click)="showPasswordModal()" nz-menu-item>修改密码</li>
-                <ng-container *ngIf="roleType == 3">
-                    <li (click)="showSeparationModal()" nz-menu-item>三员分立</li>
-                </ng-container>
+<!--                <ng-container *ngIf="roleType == 3">-->
+<!--                    <li (click)="showSeparationModal()" nz-menu-item>三员分立</li>-->
+<!--                </ng-container>-->
                 <li nz-menu-item (click)="logout()">退出</li>
             </ul>
         </nz-dropdown>

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

@@ -31,7 +31,7 @@
                             <input id="key" style="width: 85%;display: inline-block" placeholder="输入键值" type="text" name="key"
                                    nz-input formControlName="key">
 <!--                            <button nz-button nzType="primary" (click)="showKeymodal()">选择</button>-->
-                            <nz-form-explain *ngIf="validateForm.get('key').dirty && validateForm.get('key').errors">请选择键值!</nz-form-explain>
+                            <nz-form-explain *ngIf="validateForm.get('key').dirty && validateForm.get('key').errors">请输入键值!</nz-form-explain>
                         </nz-form-control>
                     </nz-form-item>
                     <nz-form-item>
@@ -76,7 +76,7 @@
                         </nz-form-control>
                     </nz-form-item>
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="6">监控项描述</nz-form-label>
+                        <nz-form-label nzRequired [nzSpan]="6">监控项描述</nz-form-label>
                         <nz-form-control [nzSpan]="14">
                             <textarea nz-input id="description" name="description" formControlName="description" placeholder="监控项描述" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
                         </nz-form-control>

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

@@ -73,7 +73,7 @@ export class BasiCheckComponent implements OnInit {
             delay: [null, [Validators.required]],
             interfaceid: [null],
             templateid:[null],
-            description:[null],
+            description:[null,[Validators.required]],
         });
         this.triggerObj = {
             condition: '',

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

@@ -52,13 +52,6 @@
             <nz-form-control [nzSpan]="20">
                 <ng-container *ngFor="let item of interfaceslist;let i = index;">
                     <div nz-row [nzGutter]="12">
-                        <nz-form-control nz-col [nzSpan]="5">
-                            <nz-select name="main" nzPlaceHolder="选择接口类型" [(ngModel)]="item.main"
-                                       (ngModelChange)="changeMain(i)">
-                                <nz-option nzValue="1" nzLabel="默认"></nz-option>
-                                <nz-option nzValue="0" nzLabel="不默认"></nz-option>
-                            </nz-select>
-                        </nz-form-control>
                         <nz-form-control nz-col [nzSpan]="4">
                             <input type="text" placeholder="IP地址" nz-input name="ip" [(ngModel)]="item.ip">
                         </nz-form-control>

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

@@ -172,8 +172,8 @@
                                     <span (click)="showEditModal(data)">编辑监测点</span>
                                     <span (click)="deleteCheckItem(data)">删除监测点</span>
                                     <br>
-                                    <span *ngIf="data.triggerCount == 0" (click)="showAddThresholdModal(data)">添加阈值</span>
-                                    <span *ngIf="data.triggerCount > 0" (click)="showEditThresholdModal(data)">编辑阈值</span>
+                                    <span  (click)="showAddThresholdModal(data)">添加阈值</span>
+                                    <span  (click)="showEditThresholdModal(data)">编辑阈值</span>
                                 </ng-container>
                                 <span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: green">已启用</span>
                                 <span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>

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

@@ -651,7 +651,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
 
     //添加阈值
     showAddThresholdModal(item){
-        this.smartThreshold.showAddModal("添加阈值",item.itemid,this.realName);
+        this.smartThreshold.showAddModal("添加阈值",item.id,item.name);
     }
 
     //编辑阈值

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

@@ -86,12 +86,6 @@
         </button>
     </div>
     <div nz-col nzSpan="7" class="text-right 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>
@@ -102,7 +96,6 @@
           (nzPageIndexChange)="change($event)">
     <thead>
     <tr>
-        <th [nzChecked]="allChecked"></th>
         <th>名称</th>
         <th>状态</th>
         <th>设备类型</th>
@@ -113,8 +106,6 @@
     <tbody>
     <ng-container *ngFor="let item of nzTable.data">
         <tr>
-            <td nzShowCheckbox (nzCheckedChange)="selectChecked($event,item)"
-                [(nzChecked)]="item.checked"></td>
             <td class="cursor main-color">
                 <span (click)="goDetail(item)">{{item.name}}</span>
             </td>

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

@@ -37,7 +37,7 @@ export class OverAllService {
 
     //停止-开启监控
     updateHostStatus(data): Observable<any> {
-        return this.http.get(SERVER_API_URL + '/host/updateHostStatus/' +this.commonSer.toQuery(data));
+        return this.http.get(SERVER_API_URL + '/host/updateHostStatus?' +this.commonSer.toQuery(data));
     }
 
     //批量停止开启监控接口

src/main/webapp/app/system/group/group.component.html

@@ -42,9 +42,9 @@
       <button (click)="showUserModal()" nz-button nzType="primary">新增用户</button>
       <button (click)="batchDelete()" nz-button nzType="default">批量删除</button>
       <!--<button nz-button nzType="default">批量修改</button>-->
-      <button (click)="downLoad()" nz-button nzType="default">下载模版</button>
-      <button (click)="showUploadModalOrg()" nz-button nzType="default">导入组织</button>
-      <button (click)="showUploadModalUser()" nz-button nzType="default">导入用户</button>
+<!--      <button (click)="downLoad()" nz-button nzType="default">下载模版</button>-->
+<!--      <button (click)="showUploadModalOrg()" nz-button nzType="default">导入组织</button>-->
+<!--      <button (click)="showUploadModalUser()" nz-button nzType="default">导入用户</button>-->
       <button style="float: right" (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
       <input  style="display: inline-block;width: 150px;margin-right: 10px;float: right" nz-input placeholder="姓名/手机号码" (keyup.enter)="search()" [(ngModel)]="name">
     </div>