diff --git a/src/app/pages/main.scss b/src/app/pages/main.scss index 92213a7..ae745e3 100644 --- a/src/app/pages/main.scss +++ b/src/app/pages/main.scss @@ -56,7 +56,21 @@ .table-operation-box{ margin-bottom: 16px; } - +/* 表格样式 */ +.table-box { + .table-operation-btn { + padding-left: 2px; + padding-right: 2px; + cursor: pointer; + font-size: 20px; + } + .edit{ + color: #40a9ff; + } + .danger{ + color: #f86c6b; + } +} /* 目录树样式 */ :host /deep/ ul.tree{ diff --git a/src/app/pages/system-management/system-management-routing.module.ts b/src/app/pages/system-management/system-management-routing.module.ts index f3be8bc..f52016b 100644 --- a/src/app/pages/system-management/system-management-routing.module.ts +++ b/src/app/pages/system-management/system-management-routing.module.ts @@ -8,6 +8,7 @@ import { UserManagementComponent } from './user-management/user-management.compo import { DepartmentManagementComponent } from './department-management/department-management.component'; import { OperationLogsComponent } from './operation-logs/operation-logs.component'; import { DataSynchronizeComponent } from './data-synchronize/data-synchronize.component'; +import { UserManagementModifyComponent } from './user-management/user-management-modify/user-management-modify.component'; const systemManagementRoutes: Routes = [ { @@ -29,7 +30,7 @@ const systemManagementRoutes: Routes = [ }, { path: 'users', - component: UserManagementComponent + component: UserManagementComponent, }, { path: 'departments', @@ -42,6 +43,10 @@ const systemManagementRoutes: Routes = [ { path: 'synchronization', component: DataSynchronizeComponent + }, + { + path: 'users/modify', + component: UserManagementModifyComponent } ] } diff --git a/src/app/pages/system-management/system-management.module.ts b/src/app/pages/system-management/system-management.module.ts index 313ceae..9a6ff3e 100644 --- a/src/app/pages/system-management/system-management.module.ts +++ b/src/app/pages/system-management/system-management.module.ts @@ -21,6 +21,7 @@ import { ColorSettingsComponent } from './personal-settings/color-settings/color import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/msg-alert-warning.component'; import { FlightAgencyComponent } from './personal-settings/flight-agency/flight-agency.component'; import { ComponentsModule } from '../../components/components.module'; +import { UserManagementModifyComponent } from './user-management/user-management-modify/user-management-modify.component'; @NgModule({ imports: [ CommonModule, @@ -42,6 +43,7 @@ import { ComponentsModule } from '../../components/components.module'; ColorSettingsComponent, MsgAlertWarningComponent, FlightAgencyComponent, + UserManagementModifyComponent, ], providers : [ { provide: NZ_I18N, useValue: zh_CN } ], diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html new file mode 100644 index 0000000..42ad053 --- /dev/null +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html @@ -0,0 +1,58 @@ +
+
+
+ + 姓名 + + + 请输入姓名 + + + + 统一身份认证账号 + + + 请输入统一身份认证账号 + + + + 本系统密码 + + + 请输入密码 + + + + 所属机构 + + + 请选择所属机构 + + + + 身份证号 + + + + + + 邮箱 + + + + + + 电话 + + + + + + + + + + +
+
+
\ No newline at end of file diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.spec.ts b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.spec.ts new file mode 100644 index 0000000..1a06c95 --- /dev/null +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserManagementModifyComponent } from './user-management-modify.component'; + +describe('UserManagementModifyComponent', () => { + let component: UserManagementModifyComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UserManagementModifyComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UserManagementModifyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts new file mode 100644 index 0000000..b636eb9 --- /dev/null +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts @@ -0,0 +1,46 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder,FormControl,FormGroup,Validators} from '@angular/forms'; + +@Component({ + selector: 'app-user-management-modify', + templateUrl: './user-management-modify.component.html', + styleUrls: ['./user-management-modify.component.scss','../../../main.scss'] +}) +export class UserManagementModifyComponent implements OnInit { + validateForm: FormGroup; + + constructor( + private fb: FormBuilder + ) { } + + ngOnInit() { + this.validateForm = this.fb.group({ + real_name:[ null, [ Validators.required ] ], + loginId:[ null, [ Validators.required ] ], + password:[ null, [ Validators.required ] ], + identify_num:[ null], + email:[ null], + mobile:[ null], + }); + } + submitForm(): void { + for (const i in this.validateForm.controls) { + this.validateForm.controls[ i ].markAsDirty(); + this.validateForm.controls[ i ].updateValueAndValidity(); + } + } + updateConfirmValidator(): void { + /** wait for refresh value */ + Promise.resolve().then(() => this.validateForm.controls.checkPassword.updateValueAndValidity()); + } + + confirmationValidator = (control: FormControl): { [ s: string ]: boolean } => { + if (!control.value) { + return { required: true }; + } else if (control.value !== this.validateForm.controls.password.value) { + return { confirm: true, error: true }; + } + }; + + +} diff --git a/src/app/pages/system-management/user-management/user-management.component.html b/src/app/pages/system-management/user-management/user-management.component.html index eaf3837..091f556 100644 --- a/src/app/pages/system-management/user-management/user-management.component.html +++ b/src/app/pages/system-management/user-management/user-management.component.html @@ -11,7 +11,7 @@ 姓名 - + @@ -19,57 +19,151 @@ 用户名 - +
- - + +
- +
-
- - - - - 姓名 - - 性别 - 用户名 - 邮箱 - 电话 - 操作 - - - - - {{item.real_name}} - - 男 - 女 - - {{item.login_name}} - {{item.email}} - {{item.mobile}} - - - + +
+ + + + 姓名 + 性别 + 用户名 + 邮箱 + 电话 + 操作 + + + + + {{item.real_name}} + + 男 + 女 + + {{item.login_name}} + {{item.email}} + {{item.mobile}} + + + + + + + - +
+ +
-
- -
+
- \ No newline at end of file + +
+ + +
+
+
+ + 姓名 + {{userDetail.real_name}} + 无 + +
+
+ + 统一身份认证账号 + {{userDetail.loginId}} + 无 + +
+
+
+
+ + 本系统密码 + {{userDetail.password}} + 无 + +
+
+ + 所属机构 + {{option.organization}} + 无 + +
+
+
+
+ + 身份证号 + {{userDetail.identify_num}} + 无 + +
+
+ + 邮箱 + {{userDetail.email}} + 无 + +
+
+
+
+ + 电话 + {{userDetail.mobile}} + 无 + +
+
+ + 所属角色 + + {{option.role_name}}、 + + 无 + +
+
+
+
+ + 状态 + 已激活 + 未激活 + 无 + +
+
+ + 性别 + 男 + 女 + 无 + +
+
+
+ +
\ No newline at end of file diff --git a/src/app/pages/system-management/user-management/user-management.component.scss b/src/app/pages/system-management/user-management/user-management.component.scss index bea8707..4357470 100644 --- a/src/app/pages/system-management/user-management/user-management.component.scss +++ b/src/app/pages/system-management/user-management/user-management.component.scss @@ -2,4 +2,9 @@ .card{ } -} \ No newline at end of file +} +.user-detail{ + .detail-item-text{ + color: #1890ff; + } +} \ No newline at end of file diff --git a/src/app/pages/system-management/user-management/user-management.component.ts b/src/app/pages/system-management/user-management/user-management.component.ts index 96f472f..4f24574 100644 --- a/src/app/pages/system-management/user-management/user-management.component.ts +++ b/src/app/pages/system-management/user-management/user-management.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { HttpClientService } from '../../../services/http-client.service'; +import { Router } from '@angular/router'; import 'ztree'; declare var $: any; @@ -13,12 +14,16 @@ declare var jQuery: any; export class UserManagementComponent implements OnInit { treeSelected:any; //树模型-当前选中项 collectionSize:any ; + public tableData:any=[]; statusParamsTable:any={ //获取目录树接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 status:1, } statusParamsTree:any={ //获取机构接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 status:1, } + statusParamsDetail:any={ //获取用户详情接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 + status:1, + } public search:any={ page_index:'1', page_size:'10', @@ -26,30 +31,80 @@ export class UserManagementComponent implements OnInit { login_name:'', orgId:'', } - isLoading:false; - public tableData:any=[]; + visible = false; + userDetail:any={}; //用户详情 + constructor( private http:HttpClientService, + private router:Router, ) { } ngOnInit() { this.initTree(); this.queryTable(); } + //新增、修改 1新增 2修改 + addModify(type,item?){ + if(type==1){ + console.log(222) + this.router.navigate(['app/system/users/modify'],{queryParams:{operateType:1}}) + }else if(type==2){ + + } + } + //打开详情页面 + open(item): void { + this.statusParamsDetail.status=1; + this.visible = true; + this.userDetail={}; + this.http.get('/sysapi/setting/user/detail/list', { uid: item.uid }).subscribe((json)=>{ + if(json.is_success){ + if(json.body){ + this.statusParamsDetail.status=3; + this.userDetail=json.body; + }else{ + this.statusParamsDetail.status=4; + } + }else{ + this.statusParamsDetail.status=0; + } + }) + } + //关闭详情页面 + close(): void { + this.visible = false; + } + //重置，重置搜索条件 + reset(){ + this.search.page_index=1; + this.search.page_size=10; + this.search.real_name=''; + this.search.login_name=''; + this.queryTable(); + } //获取列表 queryTable():void{ this.statusParamsTable.status=1; this.http.get('/sysapi/setting/user/list',this.search).subscribe((json)=>{ if(json.is_success){ this.tableData=json.body.list; - this.statusParamsTable.status=3; this.collectionSize=json.body.total; + if(json.body.list&&json.body.list.length>0){ + this.statusParamsTable.status=3; + }else{ + this.statusParamsTable.status=4; + } }else{ this.statusParamsTable.status=0; } }) } + //翻页 + pageChange(event){ + this.search.page_index=event; + this.queryTable(); + } //树模型参数设置 public zNodes: any[]; setting = { @@ -78,7 +133,7 @@ export class UserManagementComponent implements OnInit { }, }, }; - //新树模型 + //获取机构列表，树模型数据处理 initTree(){ //获取目录列表 this.statusParamsTree.status=1;