bug 修复

src/main/webapp/app/early-warning/modal/warnging-rule/warnging-rule.component.html

@@ -156,7 +156,7 @@
                                        name="resourceWarningTims"
                                        type="text"
                                        nz-input
-                                       formControlName="resourceWarningTims">
+                                       formControlName="businessWarningValue">
                             </nz-form-control>
                         </nz-form-item>
                         <nz-form-item nzFlex>
@@ -176,7 +176,7 @@
                                        name="businessThresholdValue"
                                        type="text"
                                        nz-input
-                                       formControlName="resourceWarningTims">
+                                       formControlName="businessThresholdValue">
                             </nz-form-control>
                         </nz-form-item>
                     </ng-container>
@@ -209,7 +209,7 @@
                                 <input style="width: 100px;" placeholder="未处理时长" name="jobUntreatedDays"
                                        type="text"
                                        nz-input
-                                       formControlName="resourceWarningTims">
+                                       formControlName="jobUntreatedDays">
                             </nz-form-control>
                         </nz-form-item>
                     </ng-container>

src/main/webapp/app/early-warning/modal/warnging-rule/warnging-rule.component.ts

@@ -42,7 +42,7 @@ export class WarngingRuleComponent implements OnInit {
     initForm() {
         this.validateForm = this.fb.group({
             name: [null, [Validators.required]],
-            type: ['1'], level: [null],
+            type: ['1'], level: ['1'],
             cycle: ['1'], content: [null],
             fileId: [null], resourceGroupType: ['1'],
             resourceGroupValue: [null], resourceWarningLevel: ['1'],

src/main/webapp/app/early-warning/modal/warning-rule-look/warning-rule-look.component.html

@@ -41,10 +41,10 @@
                     <nz-form-item nzFlex>
                         <nz-form-label [nzSpan]="8" nzFor="serialnoA">预警周期</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <ng-container *ngIf="msgObj?.level == 1">每天</ng-container>
-                            <ng-container *ngIf="msgObj?.level == 2">每周</ng-container>
-                            <ng-container *ngIf="msgObj?.level == 3">每月</ng-container>
-                            <ng-container *ngIf="msgObj?.level == 4">每年</ng-container>
+                            <ng-container *ngIf="msgObj?.cycle == '1'">每天</ng-container>
+                            <ng-container *ngIf="msgObj?.cycle == '2'">每周</ng-container>
+                            <ng-container *ngIf="msgObj?.cycle == '3'">每月</ng-container>
+                            <ng-container *ngIf="msgObj?.cycle == '4'">每年</ng-container>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -57,7 +57,7 @@
                             <nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="secondLevelType">
                                 监测对象
                             </nz-form-label>
-                            <nz-form-control [nzSpan]="4">
+                            <nz-form-control [nzSpan]="14">
                                 <span *ngIf="msgObj?.resourceGroupType == '1'">按资源分组</span>
                                 <span *ngIf="msgObj?.resourceGroupType == '2'">按设备类型分组</span>
                             </nz-form-control>
@@ -132,14 +132,14 @@
                                 <ng-container *ngIf="msgObj?.businessWarningSymbol == '3'">小于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessWarningSymbol == '4'">大于等于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessWarningSymbol == '5'">等于</ng-container>
-                                {{msgObj?.businessWarningValue}}
+                                {{msgObj?.businessWarningValue || '-'}}
                                 <br>
                                 <ng-container *ngIf="msgObj?.businessThresholdSymbol == '1'">大于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessThresholdSymbol == '2'">大于等于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessThresholdSymbol == '3'">小于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessThresholdSymbol == '4'">大于等于</ng-container>
                                 <ng-container *ngIf="msgObj?.businessThresholdSymbol == '5'">等于</ng-container>
-                                {{msgObj?.businessThresholdValue}}
+                                {{msgObj?.businessThresholdValue || '-'}}
                             </nz-form-control>
                         </nz-form-item>
                     </div>

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

@@ -63,7 +63,9 @@
 
 </div>
 
-<nz-table #nzTable [nzData]="page.list" [nzLoading]="page.isLoading">
+<nz-table #nzTable [nzData]="page.list"  [nzTotal]="page.totalNum" [nzFrontPagination]="false"
+          [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)"
+          [nzLoading]="page.isLoading">
     <thead>
     <tr>
         <th nzWidth="20%">计划名称</th>

src/main/webapp/app/work/inspect-plan-config/inspect-plan-config.component.ts

@@ -31,7 +31,7 @@ export class InspectPlanConfigComponent implements OnInit {
     page = {
         list: [],
         isLoading: false,
-        pageCount: 100000,
+        pageCount: 10,
         pageNum: 1,
         totalNum: null
     };
@@ -70,7 +70,7 @@ export class InspectPlanConfigComponent implements OnInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.page.list = res.data.data;
-                    this.page.totalNum = this.page.list.length;
+                    this.page.totalNum = res.data.totalNum;
                 }
                 this.page.isLoading = false;
             }

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

@@ -46,7 +46,9 @@
     </div>
 </div>
 
-<nz-table #nzTable [nzData]="planList" [nzLoading]="isLoading">
+<nz-table #nzTable [nzData]="planList" [nzTotal]="totalNum" [nzFrontPagination]="false"
+          [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)"
+          [nzLoading]="isLoading">
     <thead>
     <tr>
         <th nzWidth="20%">计划名称</th>

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

@@ -23,7 +23,7 @@ export class InspectPlanComponent implements OnInit {
     timeEnd;
 
     isLoading = false;
-    pageCount = 100000;
+    pageCount = 10;
     pageNum = 1;
     totalNum;
 
@@ -46,7 +46,7 @@ export class InspectPlanComponent implements OnInit {
     };
 
     constructor(private workSer: WorkService, private message: NzMessageService,
-                private datePipe:DatePipe,
+                private datePipe: DatePipe,
                 private commonSer: CommonService,
                 private modalSer: NzModalService) {
     }
@@ -83,7 +83,7 @@ export class InspectPlanComponent implements OnInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.planList = res.data.data;
-                    this.totalNum = this.planList.length;
+                    this.totalNum = res.data.totalNum;
                 }
                 this.isLoading = false;
             }