-
-
+
+
+
+
+
+ 姓名
+
+
+
+
+
+
+
+ 用户名
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 姓名 |
+
+ 性别 |
+ 用户名 |
+ 邮箱 |
+ 电话 |
+ 操作 |
+
+
+
+
+ | {{item.real_name}} |
+
+ 男
+ 女
+ |
+ {{item.login_name}} |
+ {{item.email}} |
+ {{item.mobile}} |
+ |
+
+
+
+
+
+
+
+
+
\ 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 c251a11..bea8707 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,4 @@
.card{
}
-}
\ No newline at end of file
+}
\ 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 fa650e0..96f472f 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
@@ -12,16 +12,22 @@ declare var jQuery: any;
})
export class UserManagementComponent implements OnInit {
treeSelected:any; //树模型-当前选中项
+ collectionSize:any ;
+ statusParamsTable:any={ //获取目录树接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据
+ status:1,
+ }
+ statusParamsTree:any={ //获取机构接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据
+ status:1,
+ }
public search:any={
page_index:'1',
page_size:'10',
real_name:'',
login_name:'',
- orgId:'',
+ orgId:'',
}
- parentNode:any;
- parentName:any;
- isTreeTop:any=false; //判断是否为树最顶层
+ isLoading:false;
+ public tableData:any=[];
constructor(
private http:HttpClientService,
@@ -29,17 +35,31 @@ export class UserManagementComponent implements OnInit {
ngOnInit() {
this.initTree();
+ 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;
+ }else{
+ this.statusParamsTable.status=0;
+ }
+ })
}
//树模型参数设置
public zNodes: any[];
setting = {
data: {
simpleData: {
- enable: true
+ enable: true
}
},
view: {
- showLine: false,
+ showLine: true,
dblClickExpand: false,
showIcon:true
},
@@ -47,47 +67,50 @@ export class UserManagementComponent implements OnInit {
//节点点击事件
onClick: (event, treeId, treeNode, clickFlag) => {
var zTree = $.fn.zTree.getZTreeObj("treeDemo");
- zTree.expandNode(treeNode);
this.treeSelected=treeNode;
- this.search.orgId=this.treeSelected.id;
- this.parentNode=this.treeSelected.getParentNode();
- if(!this.parentNode){
- this.isTreeTop=true;
- }else{
- this.isTreeTop=false;
+ let isTopNode=this.treeSelected.getParentNode(); //是否为顶级节点 true不是顶级节点 false 为顶级节点
+ if(isTopNode){ //子节点
+ this.search.orgId=this.treeSelected.id;
+ }else{ //顶级节点
+ this.search.orgId='';
}
+ this.queryTable();
},
- //节点展开事件
- onExpand: (event, treeId, treeNode) => {
-
- }
},
};
//新树模型
initTree(){
//获取目录列表
+ this.statusParamsTree.status=1;
this.http.get("/sysapi/setting/organization/list",).subscribe(json=>{
- if(json.is_success&&json.body){
- let children=[];
- for(var i=0;i
0){
+ this.statusParamsTree.status=3;
+ let children=[];
+ for(var i=0;i
Date: Tue, 20 Nov 2018 18:29:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E3=80=81=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/main.scss | 16 +-
.../system-management-routing.module.ts | 7 +-
.../system-management.module.ts | 2 +
.../user-management-modify.component.html | 58 ++++++
.../user-management-modify.component.scss | 0
.../user-management-modify.component.spec.ts | 25 +++
.../user-management-modify.component.ts | 46 +++++
.../user-management.component.html | 168 ++++++++++++++----
.../user-management.component.scss | 7 +-
.../user-management.component.ts | 63 ++++++-
10 files changed, 348 insertions(+), 44 deletions(-)
create mode 100644 src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
create mode 100644 src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss
create mode 100644 src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.spec.ts
create mode 100644 src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts
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 @@