src/app/routes/devices/basic-info/device-edit/device-edit.component.html
@@ -11,7 +11,7 @@ </nz-input> </div> <div nz-form-label nz-col [nzSm]="4" [nzXs]="24"> <label>mac</label> <label nz-form-item-required>mac</label> </div> <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback> <nz-input formControlName="mac" maxlength="20" [nzPlaceHolder]="'mac地址'"> @@ -57,7 +57,7 @@ </nz-option> </nz-select> </div> </div> </div> <div nz-form-item nz-row class="mb-sm"> <div nz-form-label nz-col [nzSm]="4" [nzXs]="24"> <label>监控点</label> @@ -76,23 +76,23 @@ <nz-input formControlName="address" maxlength="20" [nzPlaceHolder]="'设备安装的具体地址'"> </nz-input> </div> </div> </div> <div nz-form-item nz-row class="mb-sm"> <div nz-form-label nz-col [nzSm]="4" [nzXs]="24"> <label>生产时间</label> </div> <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback> <nz-datepicker nzSize="large" style="width: 100%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'选择时间'" [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker> [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker> </div> <div nz-form-label nz-col [nzSm]="4" [nzXs]="24"> <label>安装时间</label> </div> <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback> <nz-datepicker nzSize="large" style="width: 100%;" formControlName="installTime" nzShowTime [nzPlaceHolder]="'选择时间'" [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker> [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker> </div> </div> </div> <div class="modal-footer"> <button nz-button type="button" (click)="close()">关闭</button> <button nz-button [nzType]="'primary'" [nzLoading]="isSaving"> @@ -102,4 +102,4 @@ </span> </button> </div> </form> </form> src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -39,7 +39,7 @@ } const validates:Device = { name:[data.name,[Validators.required]], mac:[data.mac], mac:[data.mac,[Validators.required]], deviceVersionId:[data.deviceVersionId], monitorPointId:[data.monitorPointId], operateUserId:[data.operateUserId], @@ -71,7 +71,7 @@ const pageBean: PageBean = {pageIndex: 0, pageSize: 20}; this.monitorPointService.getPagingList(pageBean, text).subscribe( (res: PageBean) => { if (res != null && res.data != null) { if (res != null && res.data != null) { this.monitorPoints = res.data; } const monitorPoint = this.data.monitorPoint; @@ -83,7 +83,7 @@ ); if ( hasSelectedValue ) { this.monitorPoints.push(monitorPoint); } } } } ); @@ -92,7 +92,7 @@ const pageBean: PageBean = {pageIndex: 0, pageSize: 20}; this.versionService.getPagingList(pageBean, text).subscribe( (res: PageBean) => { if (res != null && res.data != null) { if (res != null && res.data != null) { this.deviceVersions = res.data; } const deviceVersion = this.data.deviceVersion; @@ -104,7 +104,7 @@ ); if ( hasSelectedValue ) { this.monitorPoints.push(deviceVersion); } } } } ); @@ -113,7 +113,7 @@ const pageBean: PageBean = {pageIndex: 0, pageSize: 20}; this.operateUserService.getPagingList(pageBean, text).subscribe( (res: PageBean) => { if (res != null && res.data != null) { if (res != null && res.data != null) { this.operateUsers = res.data; } const operateUser = this.data.operateUser; @@ -125,7 +125,7 @@ ); if ( hasSelectedValue ) { this.monitorPoints.push(operateUser); } } } } ); src/environments/environment.hmr.ts
@@ -4,5 +4,5 @@ production: false, hmr: true, useHash: true, SERVER_BASH_URL: `http://127.0.0.1:8080/screen_api_v2/` SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/` };
