update

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

@@ -8,13 +8,11 @@
         <a>告警管理</a>
       </nz-breadcrumb-item>
       <nz-breadcrumb-item>
-        告警记录
+        告警推送日志
       </nz-breadcrumb-item>
     </nz-breadcrumb>
   </div>
   <div nz-col nzSpan="8" class="text-right">
-    <button nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
     <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
   </div>
 </div>
@@ -62,7 +60,7 @@
   </div>
 </div>
 <div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
-  <input [(ngModel)]="obj.name" nz-input placeholder="搜索">
+  <input [(ngModel)]="obj.name" nz-input placeholder="告警信息">
   <button (click)="searchValue()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
 </div>
 

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

@@ -28,22 +28,22 @@
     </nz-select>
   </div>
   <div nz-col nzSpan="12" class="text-right">
-    <button nz-button nzType="default" (click)="showGroupModal()"><i class="anticon anticon-plus"></i>添加
+    <button nz-button nzType="default" (click)="showGroupModal()"><i class="anticon anticon-plus-circle-o"></i>添加
     </button>
     <button nz-button nzType="default" (click)="editGroup()"><i class="anticon anticon-form"></i>编辑</button>
     <button nz-button nzType="default" (click)="deleteGroup()"><i class="anticon anticon-close-circle-o"></i>删除</button>
-    <button nz-button nzType="default"><i class="anticon anticon-pause-circle-o"></i>暂停</button>
+    <!--<button nz-button nzType="default"><i class="anticon anticon-pause-circle-o"></i>暂停</button>-->
   </div>
 </div>
 <div nz-row class="search-form">
   <div nz-col nzSpan="16">
-    <button (click)="showAlarmModal()" nz-button nzType="default"><i class="anticon anticon-plus"></i>新增告警推送</button>
+    <button (click)="showAlarmModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增告警推送</button>
   </div>
 </div>
 <nz-table #nzTable [nzData]="setList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)">
   <thead>
   <tr>
-    <th nzShowSort>名称</th>
+    <th>名称</th>
     <th>状态</th>
     <th>发送方式</th>
     <th nzWidth="15%">发送对象</th>

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

@@ -122,7 +122,7 @@ export class AlarmSetComponent implements OnInit {
         this.smartAlarmModal.showEditModal("编辑告警",item.actionid);
     }
 
-    //启用或暂停告警组
+    //启用或暂停告警组 --单个
     changeStatus(title, status, item) {
         this.modalService.confirm({
             nzTitle: title,
@@ -146,6 +146,7 @@ export class AlarmSetComponent implements OnInit {
         });
     }
 
+
     //删除告警
     deleteAlarm(item) {
         this.modalSer.confirm({

src/main/webapp/app/alarm/modal/media-type/media-type.component.ts

@@ -57,7 +57,7 @@ export class MediaTypeComponent implements OnInit {
                     data.type += "";
                     this.validateForm.patchValue(data);
                 }else{
-                    this.message.info(res.errMsg);
+                    this.message.error(res.errMsg);
                 }
             }
         )
@@ -143,8 +143,10 @@ export class MediaTypeComponent implements OnInit {
                 if (res.errCode == 10000) {
                     this.isVisible = false;
                     this.initForm();
-                    this.message.info('添加成功');
+                    this.message.success('添加成功');
                     this.done.emit();
+                }else{
+                    this.message.error(res.errMsg);
                 }
             }
         );

src/main/webapp/app/alarm/send-set/send-set.component.html

@@ -19,7 +19,7 @@
   </div>
 </div>
 <div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
-  <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus"></i>新增发送方式</button>
+  <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增发送方式</button>
 </div>
 
 <nz-table #nzTable [nzData]="sendList">

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

@@ -92,7 +92,7 @@
     </tbody>
 </nz-table>
 <p class="text-right padding-15-0">
-    <button nz-button nzType="default" (click)="showAddFollow()"><i class="anticon anticon-plus"></i>添加分组</button>
+    <button nz-button nzType="default" (click)="showAddFollow()"><i class="anticon anticon-plus-circle-o"></i>添加分组</button>
 </p>
     <div nz-row >
         <ng-container *ngFor="let item of followList;let i = index;">

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

@@ -523,7 +523,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
                         this.totalNum = res.data.totalNum;
                     }
                 }else{
-                    this.message.info(res.errMsg);
+                    this.message.error(res.errMsg);
                 }
             }
         );

src/main/webapp/app/modal/website/website.component.ts

@@ -70,7 +70,6 @@ export class WebsiteComponent implements OnInit {
     }
 
     handleOk() {
-        // this.isVisible = false;
         if(this.title == '添加网站监测'){
             this.create();
         }else{
@@ -84,12 +83,12 @@ export class WebsiteComponent implements OnInit {
         this.overAllSer.createWebscenario(this.validateForm).subscribe(
             (res)=>{
                 if(res.errCode == 10000){
-                    this.message.info('添加成功');
+                    this.message.success('添加成功');
                     this.isVisible = false;
                     this.done.emit();
                     this.initForm();
                 }else{
-                    this.message.info(res.apiResponse.errMsg);
+                    this.message.error(res.errMsg);
                 }
             }
         )
@@ -100,18 +99,19 @@ export class WebsiteComponent implements OnInit {
         this.overAllSer.updateWebscenario(this.validateForm).subscribe(
             (res)=>{
                 if(res.errCode == 10000){
-                    this.message.info('添加成功');
+                    this.message.success('添加成功');
                     this.isVisible = false;
                     this.done.emit();
                     this.initForm();
                 }else{
-                    this.message.info(res.apiResponse.errMsg);
+                    this.message.error(res.errMsg);
                 }
             }
         )
     }
 
     handleCancel() {
+        this.initForm();
         this.isVisible = false;
     }
 

src/main/webapp/app/netTopology/flow-trend/flow-trend.component.ts

@@ -117,7 +117,7 @@ export class FlowTrendComponent implements OnInit {
                                 this.outEchartData = res.data;
                                 this.setEacharts();
                             }else{
-                                this.message.info("图表暂无数据");
+                                this.message.warning("图表暂无数据");
                                 this.isLoading = false;
                             }
                         }

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.html

@@ -28,7 +28,7 @@
         </nz-select>
     </div>
     <div nz-col nzSpan="12" class="text-right">
-        <button nz-button (click)="addTopo()" nzType="default"><i class="anticon anticon-plus"></i>添加</button>
+        <button nz-button (click)="addTopo()" nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加</button>
         <button nz-button (click)="editTopo()" nzType="default"><i class="anticon anticon-form"></i>编辑</button>
         <button nz-button (click)="deleteTopo()" nzType="default"><i class="anticon anticon-play-circle-o"></i>删除</button>
     </div>

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts

@@ -228,7 +228,7 @@ export class NeTopologyComponent implements OnInit, AfterViewInit {
     //删除拓扑图
     deleteTopo() {
         if (!this.topoId) {
-            this.message.info('请选择需要删除的拓扑图');
+            this.message.warning('请选择需要删除的拓扑图');
             return false;
         }
         this.modalSer.confirm({

src/main/webapp/app/netTopology/topology-img/topology-img.component.html

@@ -20,7 +20,7 @@
 </div>
 <div nz-row class="search-form">
   <div nz-col nzSpan="12">
-    <button nz-button (click)="addIcon()" nzType="default"><i class="anticon anticon-plus"></i>添加图标</button>
+    <button nz-button (click)="addIcon()" nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加图标</button>
   </div>
 </div>
 <nz-table #nzTable [nzData]="iconList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changePage($event)">

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

@@ -55,16 +55,12 @@
         </nz-select>
     </div>
     <div nz-col nzSpan="12" class="text-right">
-        <button nz-button nzType="default" (click)="showGroupModal()" *ngIf="selectedValue == 'group'"><i
-                class="anticon anticon-plus"></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 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>
     </div>
 </div>
 <nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading" [nzShowPagination]="frontPagination">

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

@@ -47,14 +47,14 @@
     </span>
     </div>
     <div nz-col nzSpan="12" class="text-right">
-        <button nz-button nzType="default" (click)="showAddmodal()"><i class="anticon anticon-plus"></i>添加网站
+        <button nz-button nzType="default" (click)="showAddmodal()"><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"></i>删除网站
+        <button (click)="batchDeleteConfirm()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>删除网站
         </button>
     </div>
 </div>

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

@@ -21,7 +21,7 @@
 <div nz-row class="search-form">
     <div nz-col nzSpan="16">
         <button (click)="showSeparationModal()" nz-button nzType="default">三员分立</button>
-        <button (click)="showAddRoleModal()" nz-button nzType="default"><i class="anticon anticon-plus"></i>新增角色</button>
+        <button (click)="showAddRoleModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增角色</button>
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <input nz-input placeholder="角色/权限模块/资源权限">

src/main/webapp/app/work/asset-part/asset-part.component.html

@@ -36,7 +36,7 @@
     </div>
     <div nz-col nzSpan="8"></div>
     <div nz-col nzSpan="6" class="text-right">
-        <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus"></i>添加</button>
+        <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加</button>
         <button (click)="showPEditModal()" nz-button nzType="default"><i class="anticon anticon-form"></i>编辑</button>
         <button (click)="deleteParentType()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>删除
         </button>

src/main/webapp/app/work/asset-part/child-assets/child-assets.component.html

@@ -23,7 +23,7 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
   <div nz-col nzSpan="3">
-    <button (click)="showAddModal()"  nz-button nzType="default"><i class="anticon anticon-plus"></i>添加资产</button>
+    <button (click)="showAddModal()"  nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加资产</button>
   </div>
   <div nz-col nzSpan="3">
     <button  nz-button nzType="default"><i class="anticon anticon-upload"></i>导入资产</button>

src/main/webapp/app/work/inspect-plan/inspect-plan.component.html

@@ -20,7 +20,7 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="3">
-        <button (click)="addPlan()" nz-button nzType="default"><i class="anticon anticon-plus"></i>新增计划</button>
+        <button (click)="addPlan()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增计划</button>
     </div>
     <div nz-col nzSpan="4">
         <nz-select style="width: 100%;" [(ngModel)]="obj.status" nzPlaceHolder="计划状态">

src/main/webapp/app/work/modal/params-type/params-type.component.ts

@@ -70,12 +70,12 @@ export class ParamsTypeComponent implements OnInit {
         this.workSer.createTypeByparams(this.validateForm.value).subscribe(
             (res) => {
                 if (res.errCode == 10000) {
-                    this.message.info('添加成功');
+                    this.message.success('添加成功');
                     this.isVisiable = false;
                     this.done.emit();
                     this.initForm();
                 } else {
-                    this.message.info(res.errMsg);
+                    this.message.error(res.errMsg);
                 }
             }
         );

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

@@ -20,7 +20,7 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
   <div nz-col nzSpan="3">
-    <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus"></i>新增事件</button>
+    <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增事件</button>
   </div>
   <div nz-col nzSpan="3">
     <nz-select style="width: 100%;" [(ngModel)]="obj.type" nzPlaceHolder="事件分类">