update

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

@@ -79,7 +79,7 @@
         </div>
     </div>
     <div #rightDiv nz-col nzSpan="8" class="rightDiv">
-        <h2>资源数量统计<span><span class="main-color-font">{{rightTotal}}</span>个资源</span></h2>
+        <h2>资源数量统计<span><span class="main-color-font">{{deviceNo}}</span>个资源</span></h2>
         <div echarts [options]="rightOneChart" style="height: 250px;width: 100%"></div>
         <div echarts [options]="rightTwoChart" style="height: 250px;width: 100%"></div>
     </div>

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

@@ -75,6 +75,9 @@ export class HomeComponent implements OnInit,AfterViewInit {
     //我的关注
     followList;
 
+    //资源设备数量
+    deviceNo;
+
     constructor(
         private overAllSer:OverAllService,private message:NzMessageService,
         private alarmSer:AlarmService,private renderer:Renderer2,
@@ -93,6 +96,8 @@ export class HomeComponent implements OnInit,AfterViewInit {
         this.getGroup();
 
         this.getMyFollow();
+
+        this.findSize();
     }
 
     ngAfterViewInit(){
@@ -311,7 +316,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
         this.leftOneChart =
             {
                 title: {
-                    text: " " +this.leftOneTotal+'台\n设备',
+                    text: "" +this.leftOneTotal+' 台\n设备',
                     x: '41%',
                     y: '40%',
                     itemGap: 50,
@@ -531,6 +536,15 @@ export class HomeComponent implements OnInit,AfterViewInit {
         )
     }
 
+    //监控设备数
+    findSize() {
+        this.overAllSer.findSize().subscribe(
+            (res) => {
+                this.deviceNo = res.data.size;
+            }
+        );
+    }
+
     //获取告警分组
     getAlarmList(){
         const data = {

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

@@ -16,7 +16,7 @@
             <ng-template #nzTreeTemplate let-node>
                 <span class="custom-node" draggable="true" aria-grabbed="true" [class.active]="node.isSelected">
                     <label *ngIf="node.level == 0"> {{node.title}}</label>
-                    <label [(ngModel)]="node.isChecked" (click)="selectItem($event,node)" *ngIf="node.level == 1" nz-checkbox> {{node.title}}</label>
+                    <label [(ngModel)]="node.isChecked" [nzDisabled]="node.origin.disabled" (click)="selectItem($event,node)" *ngIf="node.level == 1" nz-checkbox> {{node.title}}</label>
                 </span>
             </ng-template>
 

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

@@ -70,6 +70,9 @@ export class SelectGroupComponent implements OnInit {
 
     //获取下级
     mouseAction(name: string, event: NzFormatEmitEvent) {
+        if(event.node.children.length > 0){
+            return false;
+        }
         let type;
         if (event.node.level == 0) {
             type = 'host';   //主机
@@ -100,6 +103,11 @@ export class SelectGroupComponent implements OnInit {
                         if (this.title == '选择资源' || this.title == '添加设备') {
                             res.isLeaf = true;
                         }
+                        if(res.inventoryExtends > 0){
+                            res.disabled = true;
+                        }else{
+                            res.disabled = false;
+                        }
                     });
                     event.node.addChildren(dataSet);
                 } else {

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

@@ -13,7 +13,6 @@
         </nz-breadcrumb>
     </div>
     <div nz-col nzSpan="8" class="text-right">
-        <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
         <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
         <smart-full-screen></smart-full-screen>
     </div>
@@ -56,6 +55,10 @@
                 nzPlaceHolder="结束时间"
         ></nz-date-picker>
     </div>
+
+    <div nz-col nzSpan="3" class="search-input text-right">
+        <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
+    </div>
 </div>
 <nz-spin [nzSpinning]="isLoading">
     <div echarts [options]="chartOption" style="height: 400px;width: 100%"></div>

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

@@ -87,17 +87,17 @@
                 </div>
             </div>
         </div>
-        <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">类型</label>
-                <div class="layui-input-block">
-                    <select name="city">
-                        <option value=""></option>
-                        <option *ngFor="let item of options" value="{{item.id}}">{{item.name}}</option>
-                    </select>
-                </div>
-            </div>
-        </div>
+        <!--<div class="layui-form-item">-->
+            <!--<div class="layui-inline">-->
+                <!--<label class="layui-form-label">类型</label>-->
+                <!--<div class="layui-input-block">-->
+                    <!--<select name="city">-->
+                        <!--<option value=""></option>-->
+                        <!--<option *ngFor="let item of options" value="{{item.id}}">{{item.name}}</option>-->
+                    <!--</select>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
     </form>
 </div>
 <!--连线编辑-->

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

@@ -573,12 +573,10 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                             }
                         ]
                     };
-
-                    this.isSpinning = false;
                 } else {
                     this.message.info(res.errMsg);
                 }
-
+                this.isSpinning = false;
             }
         );
     }

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

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

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

@@ -14,7 +14,6 @@
   </div>
   <div nz-col nzSpan="8" class="text-right">
     <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>
     <smart-full-screen></smart-full-screen>
   </div>
 </div>

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

@@ -40,10 +40,10 @@
               <nz-form-control [nzSpan]="14">
                 {{inventoryExtend?.inventoryNo}}
                 <ng-container *ngIf="!inventoryExtend?.hostid">
-                  <button nzSize="small" (click)="linkThen()" nz-button nzType="primary">关联</button>
+                  <button style="margin-left: 10px;" nzSize="small" (click)="linkThen()" nz-button nzType="primary">关联</button>
                 </ng-container>
                 <ng-container *ngIf="inventoryExtend?.hostid">
-                  <span (click)="goToHost(inventoryExtend?.hostid)" class="main-color-font">已关联监控资源</span>
+                  <span style="margin-left: 10px;" (click)="goToHost(inventoryExtend?.hostid)" class="main-color cursor">已关联监控资源</span>
                 </ng-container>
               </nz-form-control>
             </nz-form-item>

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

@@ -12,7 +12,7 @@
         事件处置
       </nz-breadcrumb-item>
       <nz-breadcrumb-item>
-        事件编号：123456
+        事件编号：{{event?.id}}
       </nz-breadcrumb-item>
     </nz-breadcrumb>
   </div>
@@ -27,8 +27,9 @@
     <div nz-row>
       <div nz-col nzSpan="4">事件编号</div>
       <div nz-col nzSpan="1"></div>
-      <div nz-col nzSpan="7"></div>
+      <div nz-col nzSpan="7">{{event?.id}}</div>
       <div nz-col nzSpan="4">提交时间</div>
+      <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="7">{{event?.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</div>
     </div>
     <div nz-row>
@@ -53,8 +54,11 @@
     <div nz-row>
       <div nz-col nzSpan="4">附件</div>
       <div nz-col nzSpan="1"></div>
-      <div nz-col nzSpan="7">{{event?.fileName}}
-        <span (click)="downLoad()" class="main-color cursor">下载</span>
+      <div nz-col nzSpan="7">
+        <ng-container *ngIf="event?.fileName">
+          {{event?.fileName}}
+          <span (click)="downLoad()" class="main-color cursor">下载</span>
+        </ng-container>
       </div>
     </div>
 
@@ -63,7 +67,9 @@
       <div nz-col nzSpan="4">处理结果</div>
       <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
-    {{event?.operateStatus}}
+        <span *ngIf="event?.operateStatus == '0'">未解决</span>
+        <span *ngIf="event?.operateStatus == '1'">部分解决</span>
+        <span *ngIf="event?.operateStatus == '2'">已解决</span>
       </div>
     </div>
     <div nz-row>