(click)="ngOnInit()"

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

@@ -14,7 +14,7 @@
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
     </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 (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
   </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 (click)="ngOnInit()" 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>

src/main/webapp/app/analysis/operation-work/operation-work.component.html

@@ -15,7 +15,7 @@
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.html

@@ -15,7 +15,7 @@
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.html

@@ -15,7 +15,7 @@
   </div>
   <div nz-col nzSpan="8" class="text-right">
     <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" 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>

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

@@ -9,7 +9,7 @@
     </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 (click)="ngOnInit()" 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>

src/main/webapp/app/modal/select-group/select-group.component.ts

@@ -112,7 +112,7 @@ export class SelectGroupComponent implements OnInit {
     }
 
     //选择树节点
-    selectItem(event,node) {
+    selectItem(event, node) {
         if (node.isChecked) {
             this.selectList.push(node.origin.id);   //主机
 
@@ -123,10 +123,14 @@ export class SelectGroupComponent implements OnInit {
     }
 
     handEditleOk() {
-            this.select();
+        this.select();
     }
 
     select() {
+        if(this.selectList.length == 0){
+            this.message.warning("请选择资源");
+            return false;
+        }
         this.done.emit(this.selectList);
         this.isValiaible = false;
     }

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

@@ -14,7 +14,7 @@
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
     </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 (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -17,14 +17,15 @@
         </nz-breadcrumb>
     </div>
     <div nz-col nzSpan="8" class="text-right">
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>
-<div class="tabset">
+
+<nz-spin [nzSpinning]="isSpinning">
+    <div class="tabset">
     <div class="tabset-btn">
         <button (click)="showCheckModal()" nz-button nzType="default">添加监测点</button>
-        <!--<button nz-button nzType="default">编辑</button>-->
         <button (click)="showDeleteConfirm()" nz-button nzType="default">删除</button>
     </div>
     <div class="releative" #checkEle>
@@ -191,6 +192,7 @@
         </nz-tabset>
     </div>
 </div>
+</nz-spin>
 
 <!--添加监测点-->
 <smart-basi-check #smartCheck (done)="getList()"></smart-basi-check>

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

@@ -27,7 +27,7 @@ import {DatePipe} from '@angular/common';
                 z-index: 999;
             }
             :host ::ng-deep .tabs-smart .ant-tabs-nav-scroll div.ant-tabs-tab:nth-child(3){
-                margin-right: 150px;
+                margin-right: 155px !important;
             }
         `
     ]
@@ -107,13 +107,15 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
 
     validateForm: FormGroup;
 
+    isSpinning;  //刷新
+
     constructor(private routerInfo: ActivatedRoute, private message: NzMessageService,
                 private overAllSer: OverAllService, private renderer: Renderer,private router:Router,
                 private fb: FormBuilder, private modalService: NzModalService,private datePipe:DatePipe) {
     }
 
     ngOnInit() {
-
+        this.isSpinning = true;
         this.routerInfo.queryParams.subscribe(queryParams => {
             this.hostId = queryParams.hostId;
             this.hostType = queryParams.type;
@@ -525,6 +527,17 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                     });
                     used = this.add(used);
 
+                    const arr = [
+                        {
+                            name:"已使用",
+                            value:used,
+                        },
+                        {
+                            name:"未使用",
+                            value:total,
+                        }
+                    ];
+
                     this.secondOptionRight = {
                         title: {
                             text: '磁盘总体使用占比',
@@ -534,14 +547,14 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                             trigger: 'item',
                             formatter: '{a} <br/>{b} : {c} ({d}%)'
                         },
-                        color: ['#3194e0', '#bfbfbf'],
+                        color: ['#bfbfbf','#3194e0'],
                         series: [
                             {
                                 name: '',
                                 type: 'pie',
                                 radius: '55%',
                                 center: ['50%', '60%'],
-                                data: [total, used],
+                                data: arr,
                                 itemStyle: {
                                     normal: {
                                         label: {
@@ -560,6 +573,8 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                             }
                         ]
                     };
+
+                    this.isSpinning = false;
                 } else {
                     this.message.info(res.errMsg);
                 }

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

@@ -22,7 +22,7 @@
     </div>
     <div nz-col nzSpan="3" class="text-right">
         <button (click)="search('')" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

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

@@ -19,7 +19,7 @@
     </div>
     <div nz-col nzSpan="3" class="text-right">
         <button (click)="getwebList()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

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

@@ -17,7 +17,7 @@
     </nz-breadcrumb>
   </div>
   <div nz-col nzSpan="8" class="text-right">
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
   </div>
   <div nz-col nzSpan="8" class="text-right">
     <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" 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>

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

@@ -13,7 +13,7 @@
     </nz-breadcrumb>
   </div>
   <div nz-col nzSpan="8" class="text-right">
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" 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>

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

@@ -13,7 +13,7 @@
     </nz-breadcrumb>
   </div>
   <div nz-col nzSpan="8" class="text-right">
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
     <button nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
     <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
   </div>

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

@@ -13,7 +13,7 @@
         </nz-breadcrumb>
     </div>
     <div nz-col nzSpan="8" class="text-right">
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
     </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 (click)="ngOnInit()" 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>

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

@@ -92,8 +92,8 @@ export class AssetPartComponent implements OnInit {
 
     //编辑父级分类
     showPEditModal(){
-        if(!this.obj.type){
-            this.messge.error("请选择需要编辑的分类");
+        if(this.obj.type == "all"){
+            this.messge.warning("请选择需要编辑的分类");
             return false;
         }
         this.smartTypeAsets.showEditModal("编辑分类",this.obj.type);

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

@@ -20,7 +20,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -17,7 +17,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -100,7 +100,27 @@ export class ChildAssetsComponent implements OnInit {
 
     //批量删除
     batchDeleteInventory(){
-
+        if(this.selectList.length == 0){
+            this.message.warning("请选择需要删除的资产");
+            return false;
+        }
+        const data = {
+            inventoryIds:this.selectList.map(e=>{
+                return e.id;
+            })
+        };
+        this.commonSer.confirmThing("批量删除","确定删除选择的资产？",()=>{
+            this.workSer.deleteInventory(data).subscribe(
+                (res)=>{
+                    if(res.errCode == 10000){
+                        this.getList();
+                        this.message.success("删除资产成功");
+                    }else{
+                        this.message.error(res.errMsg);
+                    }
+                }
+            )
+        })
     }
 
     //添加资产
@@ -131,13 +151,17 @@ export class ChildAssetsComponent implements OnInit {
     downLoad(){
         this.systemSer.downloadTemplate("inventory",SERVER_API_URL + "/api/template/download/").subscribe(
             (data)=>{
-                this.commonSer.downloadFile("资产模版1",data);
+                this.commonSer.downloadFile("资产模版",data);
             }
         )
     }
 
     //导出资产
     downloadInventory(){
+        let title;
+        title = this.selectList.length == 0? "确定导出所有的资产？":"确定导出所选择的资产";
+        this.commonSer.confirmThing("导出",title,()=>{
 
+        });
     }
 }

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

@@ -14,7 +14,7 @@
     </div>
     <div nz-col nzSpan="8" class="text-right">
         <button (click)="getList()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-        <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <button (click)="ngOnInit()" 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>

src/main/webapp/app/work/modal/type-asets/type-asets.component.html

@@ -4,8 +4,8 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="name">分类类型</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <button nz-button [nzType]="isParent" (click)="checkChange('parent')">父分类</button>
-        <button nz-button [nzType]="isChildren" (click)="checkChange('children')">子分类</button>
+        <button nz-button nzSize="small" [nzType]="isParent" (click)="checkChange('parent')">父分类</button>
+        <button nz-button nzSize="small" [nzType]="isChildren" (click)="checkChange('children')">子分类</button>
       </nz-form-control>
     </nz-form-item>
     <nz-form-item *ngIf="isChildren == 'primary'">

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

@@ -81,8 +81,8 @@ export class TypeAsetsComponent implements OnInit {
         this.workSer.findType(id).subscribe(
             (res)=>{
                 if(res.data.parentid){
-                    this.isParent = 'default';
-                    this.isChildren = 'primary';
+                    this.isParent = 'primary';
+                    this.isChildren = 'default';
                 }
                 this.validateForm.patchValue(res.data);
             }
@@ -90,6 +90,7 @@ export class TypeAsetsComponent implements OnInit {
     }
 
     handleCancel() {
+        this.initForm();
         this.isVisible = false;
     }
 

src/main/webapp/app/work/pararms/pararms.component.html

@@ -15,7 +15,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -18,7 +18,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -18,7 +18,7 @@
   </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 (click)="ngOnInit()" 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>

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

@@ -14,7 +14,7 @@
   </div>
   <div nz-col nzSpan="8" class="text-right">
     <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
-    <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+    <button (click)="ngOnInit()" 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>