From 27cd36be226ca2434f06b1ae9e4d43f1fea639ab Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:40:28 +0800
Subject: [PATCH] 组织配置单位和页面显示
---
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index 15870e2..47ec2f0 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -31,17 +31,16 @@
private monitorPointService: MonitorPointService,
private versionService: VersionService,
private operateUserService: OperateUserService,
- private deviceService:DeviceService,
- private http:_HttpClient
+ private deviceService: DeviceService,
+ private http: _HttpClient
) { }
data: Device;
//������������������
originalData: Device = {};
validateForm: FormGroup;
ngOnInit() {
- debugger;
- if(!!this.data){
- Object.assign(this.originalData,this.data);
+ if (!!this.data) {
+ Object.assign(this.originalData, this.data);
}
const data = this.data;
this.monitorPointChange(null);
@@ -53,7 +52,7 @@
}
const validates: Device = {
name: [data.name, [Validators.required]],
- mac: [data.mac, [Validators.required],[this.macAsyncValidator]],
+ mac: [data.mac, [Validators.required], [this.macAsyncValidator]],
deviceVersionId: [data.deviceVersionId],
monitorPointId: [data.monitorPointId],
professionId: [data.professionId],
@@ -70,20 +69,20 @@
);
}
macAsyncValidator = (control: FormControl): any => {
- return Observable.create(observer =>{
+ return Observable.create(observer => {
// ���������������mac���������
- if(!!this.originalData&&this.originalData.mac === control.value){
+ if (!!this.originalData && this.originalData.mac === control.value) {
observer.next(null);
observer.complete();
- }else {
+ } else {
const exampleService = new ExampleService();
- exampleService.or().andEqualTo({name:'mac',value:control.value});
+ exampleService.or().andEqualTo({name: 'mac', value: control.value});
this.deviceService.countByExample(exampleService).subscribe(
res => {
debugger;
- if(!!res.code&&!!res.data){
+ if (!!res.code && !!res.data) {
observer.next({ error: true, duplicated: true });
- }else{
+ } else {
observer.next(null);
}
observer.complete();
@@ -92,7 +91,7 @@
}
});
- };
+ }
close() {
this.subject.destroy();
}
@@ -106,10 +105,10 @@
ToolsService.markAsDirty(this.validateForm);
}
}
- professionChange(){
- this.http.get<ResultBean<any[]>>(environment.SERVER_BASH_URL+"profession/getall").subscribe(
+ professionChange() {
+ this.http.get<ResultBean<any[]>>(environment.SERVER_BASH_URL + 'profession/getall').subscribe(
result => {
- if(!!result.code){
+ if (!!result.code) {
this.professions = result.data;
}
}
--
Gitblit v1.8.0