update

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

@@ -119,7 +119,7 @@
     </tbody>
 </nz-table>
 <nz-modal [(nzVisible)]="isVisiable" nzWidth="780" [nzTitle]="title" [nzFooter]="null" (nzOnCancel)="handleCancel()">
-    <nz-table #nzTable [nzData]="modalList">
+    <nz-table #nzTable [nzData]="modalList" [nzFrontPagination]="true">
         <thead>
         <tr>
             <th nzShowSort>告警名称</th>
@@ -128,7 +128,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let data of modalList">
+        <tr *ngFor="let data of nzTable.data">
             <td>{{data.description}}</td>
             <td>{{data.lastchangeDate}}</td>
             <td>

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

@@ -38,6 +38,11 @@ export class ResourceAlarmComponent implements OnInit {
     pageNum = 1;
     totalNum;
 
+    //告警明细
+    pageCount1 = 10;
+    pageNum1 = 1;
+    totalNum1;
+
     modalList = [];
 
     constructor(private analysisSer: AnalysisService, private message: NzMessageService,
@@ -339,6 +344,7 @@ export class ResourceAlarmComponent implements OnInit {
     }
 
     handleCancel(){
+        this.modalList = [];
         this.isVisiable = false;
     }
 }

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

@@ -368,6 +368,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                             return a;
                         });
                     } else {
+                        this.inEchartData = [];
                         this.message.warning('图表暂无数据');
                         this.isLoading = false;
                     }
@@ -384,8 +385,10 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
                                 });
                                 this.setEacharts();
                             } else {
+                                this.inEchartData = [];
                                 this.message.warning('图表暂无数据');
                                 this.isLoading = false;
+                                this.setEacharts();
                             }
                         }
                     );
@@ -604,6 +607,7 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
         this.getEcharts(null);
         this.getInList();
         this.getOutList();
+        this.findByTime();
     }
 
 }

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

@@ -38,7 +38,7 @@
     <div nz-col nzSpan="12" class="layui-header ">
         <span (click)="addDevice()">添加设备</span>
         <!--<span (click)="addCheck()">添加监测点</span>-->
-        <span (click)="showAddImg()">添加图片</span>
+        <!--<span (click)="showAddImg()">添加图片</span>-->
         <span onClick="editor.utils.deleteSelectedNodes()">移除</span>
         <nz-select style="width: 200px;" nzPlaceHolder="选择线条" [(ngModel)]="lineType"
                    (ngModelChange)="changeLine($event)">

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

@@ -71,25 +71,25 @@
           </div>
         </div>
 
-        <div nz-row [nzGutter]="24">
-          <div nz-col [nzSpan]="12">
-            <nz-form-item nzFlex>
-              <nz-form-label [nzOffset]="4" nzRequired [nzSpan]="6" >父分类
-              </nz-form-label>
-              <nz-form-control [nzSpan]="14">
-              </nz-form-control>
-            </nz-form-item>
-          </div>
-          <div nz-col [nzSpan]="12">
-            <nz-form-item nzFlex>
-              <nz-form-label [nzSpan]="6"  nzRequired >子分类
-              </nz-form-label>
-              <nz-form-control [nzSpan]="14">
-              </nz-form-control>
-            </nz-form-item>
-          </div>
+        <!--<div nz-row [nzGutter]="24">-->
+          <!--<div nz-col [nzSpan]="12">-->
+            <!--<nz-form-item nzFlex>-->
+              <!--<nz-form-label [nzOffset]="4" nzRequired [nzSpan]="6" >父分类-->
+              <!--</nz-form-label>-->
+              <!--<nz-form-control [nzSpan]="14">-->
+              <!--</nz-form-control>-->
+            <!--</nz-form-item>-->
+          <!--</div>-->
+          <!--<div nz-col [nzSpan]="12">-->
+            <!--<nz-form-item nzFlex>-->
+              <!--<nz-form-label [nzSpan]="6"  nzRequired >子分类-->
+              <!--</nz-form-label>-->
+              <!--<nz-form-control [nzSpan]="14">-->
+              <!--</nz-form-control>-->
+            <!--</nz-form-item>-->
+          <!--</div>-->
 
-        </div>
+        <!--</div>-->
 
         <div nz-row [nzGutter]="24">
           <div nz-col [nzSpan]="12">

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

@@ -95,6 +95,11 @@ export class TypeAsetsComponent implements OnInit {
     }
 
     handleOk() {
+        if(this.isParent == 'primary'){
+            this.validateForm.patchValue({
+                parentid:null
+            })
+        }
         for(let i in this.validateForm.controls){
             this.validateForm.controls[i].markAsDirty();
             this.validateForm.controls[i].updateValueAndValidity();