From f2a2ffe4861e717ce277cb3ced693581865127d0 Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 17 Apr 2019 13:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=BF=BB?= =?UTF-8?q?=E9=A1=B5=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation-logs.component.html | 12 +- .../role-management-modify.component.html | 26 +- .../role-management-modify.component.ts | 6 +- .../role-management.component.html | 32 +- .../role-management.component.ts | 136 +++---- .../user-management.component.html | 12 +- .../user-management.component.ts | 346 +++++++++--------- 7 files changed, 293 insertions(+), 277 deletions(-) diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.html b/src/app/pages/system-management/operation-logs/operation-logs.component.html index b9a12fa..38461f8 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.html +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.html @@ -14,12 +14,12 @@ 时间 - + - @@ -48,7 +48,7 @@ - {{i+1}} + {{(search.page_index - 1)*search.page_size+i+1}} {{item.user_name}} {{item.model_name}} {{item.summary}} diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html index 5173016..12963f9 100644 --- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html +++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html @@ -68,11 +68,31 @@
-
- + + + + + 姓名 + 用户名 + 电话 + + + + + + {{item.real_name}} + {{item.login_name}} + {{item.mobile}} + + + + +
diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts index 495a956..8d61f37 100644 --- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts +++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts @@ -213,11 +213,7 @@ export class RoleManagementModifyComponent implements OnInit { closeUser(): void { this.visibleUsers = false; } - //翻页 - pageChange(event) { - this.search.page_index = event; - this.queryTable(); - } + //获取用户列表 queryTable(): void { this.statusParamsUsers.status = 1; diff --git a/src/app/pages/system-management/role-management/role-management.component.html b/src/app/pages/system-management/role-management/role-management.component.html index 7a8f309..4c05b06 100644 --- a/src/app/pages/system-management/role-management/role-management.component.html +++ b/src/app/pages/system-management/role-management/role-management.component.html @@ -23,7 +23,35 @@
- + + + + 角色名称 + 角色类型 + 创建人 + 创建日期 + 操作 + + + + + {{item.role_name}} + 系统内置用户定义 + {{item.create_by}} + {{item.create_date| date:'yyyy-MM-dd HH:mm:ss'}} + + + + + + + + + +
diff --git a/src/app/pages/system-management/role-management/role-management.component.ts b/src/app/pages/system-management/role-management/role-management.component.ts index 172c3a5..d59f76c 100644 --- a/src/app/pages/system-management/role-management/role-management.component.ts +++ b/src/app/pages/system-management/role-management/role-management.component.ts @@ -4,88 +4,74 @@ import { Router } from '@angular/router'; import { NzMessageService } from 'ng-zorro-antd'; import 'ztree'; -declare var $: any; +declare var $: any; declare var jQuery: any; @Component({ - selector: 'app-role-management', - templateUrl: './role-management.component.html', - styleUrls: ['./role-management.component.scss'] + selector: 'app-role-management', + templateUrl: './role-management.component.html', + styleUrls: ['./role-management.component.scss'] }) export class RoleManagementComponent implements OnInit { - collectionSize:any ; - public tableData:any=[]; - statusParamsTable:any={ //获取用户列表接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 - status:1, - } + collectionSize: any; + public tableData: any = []; + statusParamsTable: 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', - role_name:'', - } + statusParamsDetail: any = { //获取用户详情接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 + status: 1, + } + public search: any = { + page_index: '1', + page_size: '10', + role_name: '', + } - constructor( - private http:HttpClientService, - private router:Router, - private message: NzMessageService, - ) { } + constructor( + private http: HttpClientService, + private router: Router, + private message: NzMessageService, + ) { } - ngOnInit() { - this.queryTable(); - } - //新增、修改 1新增 2修改 - addModify(type,item?){ - if(type==1){ - this.router.navigate(['app/system/roles/modify'],{queryParams:{operateType:1}}) - }else if(type==2){ - this.router.navigate(['app/system/roles/modify'],{queryParams:{operateType:2,id:item.rid}}) - } - } - //删除 - delectConfirm(item){ - this.http.delete('/sysapi/setting/role/delete/'+item.rid).subscribe((json)=>{ - if(json.is_success){ - this.message.success(`删除成功!`); - this.queryTable(); - }else{ - this.message.error(`删除失败`) - } - }) - } - //重置，重置搜索条件 - // reset(){ - // this.search.page_index=1; - // this.search.page_size=10; - // this.search.role_name=''; - // this.queryTable(); - // } - //获取列表 - queryTable():void{ - this.search.page_index=1; - this.statusParamsTable.status=1; - this.tableData=[]; - this.http.get('/sysapi/setting/role/list',this.search).subscribe((json)=>{ - if(json.is_success){ - this.tableData=json.body.list; - 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(); - } + ngOnInit() { + this.queryTable(); + } + //新增、修改 1新增 2修改 + addModify(type, item?) { + if (type == 1) { + this.router.navigate(['app/system/roles/modify'], { queryParams: { operateType: 1 } }) + } else if (type == 2) { + this.router.navigate(['app/system/roles/modify'], { queryParams: { operateType: 2, id: item.rid } }) + } + } + //删除 + delectConfirm(item) { + this.http.delete('/sysapi/setting/role/delete/' + item.rid).subscribe((json) => { + if (json.is_success) { + this.message.success(`删除成功!`); + this.queryTable(); + } else { + this.message.error(`删除失败`) + } + }) + } + //获取列表 + queryTable(): void { + this.statusParamsTable.status = 1; + this.http.get('/sysapi/setting/role/list', this.search).subscribe((json) => { + if (json.is_success) { + this.tableData = json.body.list; + 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; + } + }) + } } 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 6323397..62b560f 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 @@ -36,7 +36,8 @@
- + 姓名 @@ -54,16 +55,13 @@ - + -
- -
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 1fede95..bd031a7 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 @@ -4,196 +4,184 @@ import { Router } from '@angular/router'; import { NzMessageService } from 'ng-zorro-antd'; import 'ztree'; -declare var $: any; +declare var $: any; declare var jQuery: any; @Component({ - selector: 'app-user-management', - templateUrl: './user-management.component.html', - styleUrls: ['./user-management.component.scss',] + selector: 'app-user-management', + templateUrl: './user-management.component.html', + styleUrls: ['./user-management.component.scss',] }) 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', - real_name:'', - login_name:'', - orgId:'', - } - visible = false; - userDetail:any={}; //用户详情 - + 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', + real_name: '', + login_name: '', + orgId: '', + } + visible = false; + userDetail: any = {}; //用户详情 + currentUserInfo = JSON.parse(sessionStorage.getItem('userInfo')); - constructor( - private http:HttpClientService, - private router:Router, - private message: NzMessageService, - ) { } + constructor( + private http: HttpClientService, + private router: Router, + private message: NzMessageService, + ) { } - ngOnInit() { + ngOnInit() { // this.currentUserInfo = JSON.parse(sessionStorage.getItem('userInfo')); // console.log(sessionStorage.getItem('userInfo')); - // 页面监听 动态改变表单高度 - $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px')); - $('#main-box-user').css('height',(document.documentElement.clientHeight-106+'px')); - $(window).resize(function(){ - $('#tree-box').css('height',(document.documentElement.clientHeight-126+'px')); - $('#main-box-user').css('height',(document.documentElement.clientHeight-126+'px')); - }) - this.initTree(); - this.queryTable(); - } - //删除 - delectConfirm(item){ - this.http.delete('/sysapi/setting/user/deleteById/'+item.uid).subscribe((json)=>{ - if(json.is_success){ - this.message.success(`删除成功!`); - this.queryTable(); - }else{ - this.message.error(`删除失败`) - } - }) - } + // 页面监听 动态改变表单高度 + $('#tree-box').css('height', (document.documentElement.clientHeight - 106 + 'px')); + $('#main-box-user').css('height', (document.documentElement.clientHeight - 106 + 'px')); + $(window).resize(function () { + $('#tree-box').css('height', (document.documentElement.clientHeight - 126 + 'px')); + $('#main-box-user').css('height', (document.documentElement.clientHeight - 126 + 'px')); + }) + this.initTree(); + this.queryTable(); + } + //删除 + delectConfirm(item) { + this.http.delete('/sysapi/setting/user/deleteById/' + item.uid).subscribe((json) => { + if (json.is_success) { + this.message.success(`删除成功!`); + this.queryTable(); + } else { + this.message.error(`删除失败`) + } + }) + } - //新增、修改 1新增 2修改 - addModify(type,item?){ - if(type==1){ - this.router.navigate(['app/system/users/modify'],{queryParams:{operateType:1}}) - }else if(type==2){ - this.router.navigate(['app/system/users/modify'],{queryParams:{operateType:2,id:item.uid}}) - } - } - //打开详情页面 - 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.search.page_index=1; - 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.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 = { - data: { - simpleData: { - enable: true - } - }, - view: { - showLine: true, - dblClickExpand: false, - showIcon:true - }, - callback: { - //节点点击事件 - onClick: (event, treeId, treeNode, clickFlag) => { - var zTree = $.fn.zTree.getZTreeObj("treeDemo"); - this.treeSelected=treeNode; - let isTopNode=this.treeSelected.getParentNode(); //是否为顶级节点 true不是顶级节点 false 为顶级节点 - if(isTopNode){ //子节点 - this.search.orgId=this.treeSelected.id; - }else{ //顶级节点 - this.search.orgId=''; - } - this.queryTable(); - }, - }, - }; - //获取机构列表，树模型数据处理 - initTree(){ - //获取目录列表 - this.statusParamsTree.status=1; - this.http.get("/sysapi/setting/organization/list",).subscribe(json=>{ - if(json.is_success){ - if(json.body.length>0){ - this.statusParamsTree.status=3; - let children=[]; - json.body.forEach(option=>{ - option.name=option.organization; - if(option.pid){ - option.pId=option.pid; - }else{ - option.pId='hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc'; - } - }); - json.body.push({ - name:"全部机构", - isParent:true, - open:true, - id:'hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc', - }) - }else{ - //数据为空 - this.statusParamsTree.status=4; - } - }else{ - //请求失败 - this.statusParamsTree.status=0; - } - this.zNodes=json.body; - $.fn.zTree.init($("#treeDemo"), this.setting, this.zNodes); - var zTree = $.fn.zTree.getZTreeObj("treeDemo"); - let node = zTree.getNodes(); - }) + //新增、修改 1新增 2修改 + addModify(type, item?) { + if (type == 1) { + this.router.navigate(['app/system/users/modify'], { queryParams: { operateType: 1 } }) + } else if (type == 2) { + this.router.navigate(['app/system/users/modify'], { queryParams: { operateType: 2, id: item.uid } }) + } + } + //打开详情页面 + 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; + } - } + //获取列表 + 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.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; + } + }) + } + + //树模型参数设置 + public zNodes: any[]; + setting = { + data: { + simpleData: { + enable: true + } + }, + view: { + showLine: true, + dblClickExpand: false, + showIcon: true + }, + callback: { + //节点点击事件 + onClick: (event, treeId, treeNode, clickFlag) => { + var zTree = $.fn.zTree.getZTreeObj("treeDemo"); + this.treeSelected = treeNode; + let isTopNode = this.treeSelected.getParentNode(); //是否为顶级节点 true不是顶级节点 false 为顶级节点 + if (isTopNode) { //子节点 + this.search.orgId = this.treeSelected.id; + } else { //顶级节点 + this.search.orgId = ''; + } + this.queryTable(); + }, + }, + }; + //获取机构列表，树模型数据处理 + initTree() { + //获取目录列表 + this.statusParamsTree.status = 1; + this.http.get("/sysapi/setting/organization/list").subscribe(json => { + if (json.is_success) { + if (json.body.length > 0) { + this.statusParamsTree.status = 3; + let children = []; + json.body.forEach(option => { + option.name = option.organization; + if (option.pid) { + option.pId = option.pid; + } else { + option.pId = 'hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc'; + } + }); + json.body.push({ + name: "全部机构", + isParent: true, + open: true, + id: 'hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc', + }) + } else { + //数据为空 + this.statusParamsTree.status = 4; + } + } else { + //请求失败 + this.statusParamsTree.status = 0; + } + this.zNodes = json.body; + $.fn.zTree.init($("#treeDemo"), this.setting, this.zNodes); + var zTree = $.fn.zTree.getZTreeObj("treeDemo"); + let node = zTree.getNodes(); + }) + + } }