Merge branch 'master' of http://180.168.156.212:2903/qinghua/smart

src/main/webapp/app/modal/basi-check/basi-check.component.html

@@ -95,7 +95,7 @@
                     <nz-form-item>
                         <nz-form-label [nzSpan]="6" nzFor="itemtype">监测点分类</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-select style="width: 80%;display: inline-block" nzPlaceHolder="选择监测点分类" name="itemtype" [nzSize]="nzSize" nzMode="tags" formControlName="applicationids">
+                            <nz-select style="width: 80%;display: inline-block" nzPlaceHolder="选择监测点分类" name="itemtype" [nzSize]="nzSize" nzMode="tags" formControlName="applications">
                                 <nz-option *ngFor="let item of checkList" nzValue="{{item.applicationid}}"
                                            nzLabel="{{item.name}}"></nz-option>
                             </nz-select>

src/main/webapp/app/modal/basi-check/basi-check.component.ts

@@ -86,7 +86,7 @@ export class BasiCheckComponent implements OnInit {
             delay: [null, [Validators.required]],
             snmp_oid: [null],
             snmp_community: ['public'],
-            applicationids: [null],
+            applications: [null],
         });
         this.triggerObj = {
             condition: '',
@@ -222,7 +222,7 @@ export class BasiCheckComponent implements OnInit {
             this.message.error('请输入必填信息');
             return false;
         }
-        this.validateForm.value.applicationids = [this.validateForm.value.applicationids];
+        this.validateForm.value.applications = [this.validateForm.value.applications];
         this.validateForm.value.hostid = this.hostId;
         if (this.title == '添加监测点') {
             this.create();