Skip to content

S
smart
Commit 02119bbd authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent ce8c43ad
Hide whitespace changes
Inline Side-by-side
Showing with 397 additions and 453 deletions
src/main/webapp/app/app.main.module.ts
View file @ 02119bbd
......@@ -75,8 +75,6 @@ import {PlanModalComponent} from './work/modal/plan-modal/plan-modal.component';
import {SelectPersonComponent} from './modal/select-person/select-person.component';
import {SelectRoleComponent} from './modal/select-role/select-role.component';
import {SeparationComponent} from './system/modal/separation/separation.component';
import {SystemComponent} from './system/modal/system/system.component';
import {SecurityComponent} from './system/modal/security/security.component';
import {TypeAsetsComponent} from './work/modal/type-asets/type-asets.component';
import {AssetsDetailComponent} from './work/asset-part/assets-detail/assets-detail.component';
import {AssetsComponent} from './work/modal/assets/assets.component';
......@@ -169,8 +167,6 @@ import {HomeComponent} from './home/home.component';
SelectPersonComponent,
SelectRoleComponent,
SeparationComponent,
SystemComponent,
SecurityComponent,
TypeAsetsComponent,
AssetsDetailComponent,
AssetsComponent,
......
src/main/webapp/app/home/home.component.html
View file @ 02119bbd
......@@ -54,7 +54,7 @@
当前告警
<nz-select style="width: 200px;" nzPlaceHolder="选择分组" [(ngModel)]="groupid" (ngModelChange)="getAlarmList()">
<ng-container *ngFor="let item of groupList">
<nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
<nz-option [nzLabel]="item.name" [nzValue]="item.groupid"></nz-option>
</ng-container>
</nz-select>
</div>
......@@ -70,8 +70,8 @@
</thead>
<tbody>
<tr *ngFor="let data of warnList">
<td class="table-timeline">
<nz-timeline-item>{{data.clock | date:"yyyy-MM-dd HH:mm:ss"}}</nz-timeline-item>
<td >
{{data.clock | date:"yyyy-MM-dd HH:mm:ss"}}
</td>
<td class="round-tag tag-form">
<nz-tag *ngIf="data.priority == 4 || data.priority == 5" [nzColor]="'#fc0d1b'"></nz-tag>
......@@ -83,3 +83,28 @@
</tr>
</tbody>
</nz-table>
<div nz-row>
<div nz-col nzSpan="12">
<div>
<div>
<p></p>
<p>所在分组</p>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="12">
<div>
<p>监测点</p>
<p>监测点</p>
</div>
<div>
PING值
</div>
</div>
<div nz-col nzSpan="12"></div>
</div>
</div>
<div nz-col nzSpan="12">
</div>
</div>
src/main/webapp/app/home/home.component.ts
View file @ 02119bbd
......@@ -284,6 +284,166 @@ export class HomeComponent implements OnInit {
);
}
//关注资源图表
setBarEcharts(){
// var color= ['#fb734e', '#e32f46','#94d96c', '#0bbcb7','#1a9bfc','#7049f0'];
// var dataStyle = {
// normal: {
// label: {
// show: false
// },
// labelLine: {
// show: false
// },
// shadowBlur: 40,
// borderWidth: 10,
// shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
// }
// };
// var placeHolderStyle = {
// normal: {
// color: '#393d50',
// label: {
// show: false
// },
// labelLine: {
// show: false
// }
// },
// emphasis: {
// color: '#393d50'
// }
// };
// option = {
// backgroundColor: '#142058',
// title: {
// text: '匹配度',
// x: 'center',
// y: 'center',
// textStyle: {
// fontWeight: 'normal',
// fontSize: 24,
// color: "#fff",
// }
// },
// tooltip: {
// trigger: 'item',
// show: true,
// formatter: "{b} : <br/>{d}%",
// backgroundColor: 'rgba(0,0,0,0.7)', // 背景
// padding: [8, 10], //内边距
// extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
// },
//
// series: [{
// name: 'Line 1',
// type: 'pie',
// clockWise: false,
// radius: [186, 200],
// center:['50%','50%'],
// itemStyle: dataStyle,
// hoverAnimation: false,
// startAngle: 90,
// label:{
// borderRadius:'10',
// },
// data: [{
// value: 54.6,
// name: '四级匹配度',
// itemStyle: {
// normal: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
// offset: 0,
// color:color[0]
// }, {
// offset: 1,
// color: color[1]
// }])
// }
// }
// },
// {
// value: 45.4,
// name: '',
// tooltip: {
// show: false
// },
// itemStyle: placeHolderStyle
// },
// ]
// },
// {
// name: 'Line 2',
// type: 'pie',
// clockWise: false,
// radius: [146, 160],
// center:['50%','50%'],
// itemStyle: dataStyle,
// hoverAnimation: false,
// startAngle: 90,
// data: [{
// value: 56.7,
// name: '三级匹配度',
// itemStyle: {
// normal: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
// offset: 0,
// color: color[2]
// }, {
// offset: 1,
// color: color[3]
// }])
// }
// }
// },
// {
// value: 43.3,
// name: '',
// tooltip: {
// show: false
// },
// itemStyle: placeHolderStyle
// },
// ]
// },
// {
// name: 'Line 3',
// type: 'pie',
// clockWise: false,
// radius: [106, 120],
// center:['50%','50%'],
// itemStyle: dataStyle,
// hoverAnimation: false,
// startAngle: 90,
// data: [{
// value: 30,
// name: '二级匹配度',
// itemStyle: {
// normal: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
// offset: 0,
// color: color[4]
// }, {
// offset: 1,
// color: color[5]
// }]),
// }
// }
// },
// {
// value: 0,
// name: '',
// tooltip: {
// show: false
// },
// itemStyle: placeHolderStyle
// },
// ]
// }
// ]
// };
}
change(e){
this.pageNum = e;
this.getAlarmList();
......
src/main/webapp/app/home/home.css
View file @ 02119bbd
......@@ -23,4 +23,6 @@ only screen and ( min-resolution: 2dppx) {
background-size: contain;
}
}
p{
margin: 0;
}
src/main/webapp/app/layouts/sidebar/sidebar.component.ts
View file @ 02119bbd
......@@ -270,8 +270,8 @@ export class SidebarComponent implements OnInit {
}
ngOnInit() {
// this.getMenu();
this.menuList = this.commonSer.listToTree('id', 'parentId', this.menuList);
this.getMenu();
// this.menuList = this.commonSer.listToTree('id', 'parentId', this.menuList);
}
getMenu() {
......
src/main/webapp/app/system/examine/examine.component.html
View file @ 02119bbd
......@@ -18,12 +18,110 @@
</div>
</div>
<!--系统管理员-->
<ng-container *ngIf="type == '系统管理员'">
<smart-system #smartSystem></smart-system>
</ng-container>
<div nz-row class="search-form">
<div nz-col nzSpan="16">
</div>
<div nz-col nzSpan="8" class="text-right">
<input nz-input placeholder="角色/权限模块/资源权限" [(ngModel)]="name">
<button nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div>
</div>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<nz-tab nzTitle="待审批">
<nz-table #basicTable [nzData]="noList">
<thead>
<tr>
<th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of noList">
<td nzShowCheckbox [(nzChecked)]="data.checked" [nzDisabled]="data.disabled" (nzCheckedChange)="refreshStatus($event)"></td>
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
<nz-tab nzTitle="已审批">
<nz-table #basicTable [nzData]="areadyList">
<thead>
<tr>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
<!--安全管理员-->
<ng-container *ngIf="type == '安全管理员'">
<smart-security #smartSecurity></smart-security>
</ng-container>
src/main/webapp/app/system/examine/examine.component.ts
View file @ 02119bbd
import {Component, OnInit} from '@angular/core';
import {SystemService} from '../system.service';
import {pageSize} from '../../app.constants';
import {NzMessageService} from 'ng-zorro-antd';
@Component({
selector: 'jhi-examine',
......@@ -7,37 +9,91 @@ import {SystemService} from '../system.service';
styles: []
})
export class ExamineComponent implements OnInit {
tabs = ['已审批', '待审批'];
dataSet: any[];
type='安全管理员';
constructor(private systemSer: SystemService) {
pageSize = pageSize;
name;
//已审批
pageNoAlready = 1;
totalNumAlready;
areadyList = [];
//未审批
pageNoNo = 1;
totalNumNo;
noList = [];
allChecked;
indeterminate;
displayData = [];
constructor(private systemSer: SystemService,private message:NzMessageService) {
}
ngOnInit() {
this.getRole();
this.getList();
currentPageDataChange($event: Array<{ entityName: string; checked: boolean; disabled: boolean; }>): void {
this.displayData = $event;
this.refreshStatus();
}
getRole() {
this.systemSer.currentUserRoles().subscribe(
(res) => {
refreshStatus(): void {
const allChecked = this.displayData.filter(value => !value.disabled).every(value => value.checked === true);
const allUnChecked = this.displayData.filter(value => !value.disabled).every(value => !value.checked);
this.allChecked = allChecked;
this.indeterminate = (!allChecked) && (!allUnChecked);
}
checkAll(value: boolean): void {
this.displayData.forEach(data => {
if (!data.disabled) {
data.checked = value;
}
);
});
this.refreshStatus();
}
ngOnInit(){
this.getCurrentRole();
}
getList() {
this.systemSer.approveList().subscribe(
getCurrentRole(){
this.systemSer.checkRole().subscribe(
(res)=>{
}
)
this.systemSer.unApproveList().subscribe(
(res)=>{
}
getListAlready() {
const data = {
pageNo: this.pageNoAlready,
pageSize: this.pageSize,
name:this.name
};
this.systemSer.getApproveOfDone(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.areadyList = res.data;
}else{
this.message.error(res.errMsg);
}
}
)
);
}
getListNo() {
const data = {
pageNo: this.pageNoNo,
pageSize: this.pageSize,
name:this.name
};
this.systemSer.unApproveListSystemManager(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.noList = res.data;
}else{
this.message.error(res.errMsg);
}
}
);
}
}
src/main/webapp/app/system/group/group.component.html
View file @ 02119bbd
......@@ -25,7 +25,7 @@
<button (click)="showModal()" nz-button nzType="default"><i class="anticon anticon-search"></i>选择部门</button>
</div>
<div nz-col nzSpan="8" class="text-right">
<input nz-input placeholder="姓名/手机号码">
<input nz-input placeholder="姓名/手机号码" [(ngModel)]="name">
<button nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div>
</div>
......@@ -34,7 +34,9 @@
<div class="padding-15-0">
<button (click)="showGroupModal()" nz-button nzType="primary">新增组织</button>
</div>
<nz-tree [(ngModel)]="nodes">
<nz-tree [(ngModel)]="nodes"
(nzClick)="getOrg($event)"
>
<ng-template #nzTreeTemplate let-node>
<span class="custom-node" draggable="true" aria-grabbed="true" [class.active]="node.isSelected">
<span>
......
src/main/webapp/app/system/group/group.component.ts
View file @ 02119bbd
......@@ -28,6 +28,9 @@ export class GroupComponent implements OnInit {
userId;
setType;
selectList = [];
name = null; //搜索文字
organizationId = null; //组织ID
constructor(private systemSer: SystemService, private message: NzMessageService,
private modalSer: NzModalService, private commonSer: CommonService) {
......@@ -76,8 +79,8 @@ export class GroupComponent implements OnInit {
getUser() {
const data = {
'userBo': {
search:null,
organizationId:null
search:this.name,
organizationId:this.organizationId
},
'pageNum': '1',
'pageSize': '10'
......@@ -89,6 +92,12 @@ export class GroupComponent implements OnInit {
);
}
getOrg(e){
console.log(e);
this.organizationId = e.node.key;
this.getUser();
}
//组织信息
getGroup() {
this.systemSer.organization().subscribe(
......
src/main/webapp/app/system/modal/role/role.component.ts
View file @ 02119bbd
......@@ -57,7 +57,7 @@ export class RoleComponent implements OnInit {
//获取菜单栏
getMenu() {
this.layoutSer.getAllMenu().subscribe(
this.systemSer.getMenuBySeparation().subscribe(
(res) => {
if (res.errCode == 10000) {
this.menuList = this.commonSer.listToTree('id', 'parentId', res.data);
......
src/main/webapp/app/system/modal/security/security.component.html deleted 100644 → 0
View file @ ce8c43ad
<div nz-row class="search-form">
<div nz-col nzSpan="16">
</div>
<div nz-col nzSpan="8" class="text-right">
<input nz-input placeholder="角色/权限模块/资源权限">
<button nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div>
</div>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<nz-tab nzTitle="待审批">
<button nz-button (click)="passApproval()" nzType="primary">通过</button>
<button nz-button (click)="backApproval()" nzType="primary">退回</button>
<nz-table #basciTable1 [nzData]="noList">
<thead>
<tr>
<th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of noList">
<td nzShowCheckbox [(nzChecked)]="data.checked" [nzDisabled]="data.disabled" (nzCheckedChange)="refreshStatus($event)"></td>
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
<nz-tab nzTitle="已审批">
<nz-table #basciTable2 [nzData]="areadyList">
<thead>
<tr>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of areadyList">
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
src/main/webapp/app/system/modal/security/security.component.ts deleted 100644 → 0
View file @ ce8c43ad
import {Component, OnInit} from '@angular/core';
import {SystemService} from '../../system.service';
import {pageSize} from '../../../app.constants';
import {NzMessageService} from 'ng-zorro-antd';
@Component({
selector: 'smart-security',
templateUrl: './security.component.html',
styles: []
})
export class SecurityComponent implements OnInit {
pageSize = pageSize;
//已审批
pageNoAlready = 1;
totalNumAlready;
areadyList = [];
//未审批
pageNoNo = 1;
totalNumNo;
noList = [];
allChecked;
indeterminate;
displayData = [];
constructor(private systemSer: SystemService,private message:NzMessageService) {
}
ngOnInit() {
this.getListAlready();
this.getListNo();
}
refreshStatus(): void {
const allChecked = this.noList.filter(value => !value.disabled).every(value => value.checked === true);
const allUnChecked = this.noList.filter(value => !value.disabled).every(value => !value.checked);
this.allChecked = allChecked;
this.indeterminate = (!allChecked) && (!allUnChecked);
}
checkAll(value: boolean): void {
this.noList.forEach(data => {
if (!data.disabled) {
data.checked = value;
}
});
this.refreshStatus();
}
getListAlready() {
const data = {
pageNo: this.pageNoAlready,
pageSize: this.pageSize
};
this.systemSer.approveListSafeManager(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.areadyList = res.data;
this.areadyList.forEach(e=>{
e.checked = false;
})
}else{
this.message.error(res.errMsg);
}
}
);
}
getListNo() {
const data = {
pageNo: this.pageNoNo,
pageSize: this.pageSize
};
this.systemSer.unapproveListSafeManager(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.noList = res.data;
this.noList.forEach(e=>{
e.checked = false;
})
}else{
this.message.error(res.errMsg);
}
}
);
}
//通过
passApproval(){
}
//退回
backApproval(){
}
}
src/main/webapp/app/system/modal/system/system.component.html deleted 100644 → 0
View file @ ce8c43ad
<div nz-row class="search-form">
<div nz-col nzSpan="16">
</div>
<div nz-col nzSpan="8" class="text-right">
<input nz-input placeholder="角色/权限模块/资源权限">
<button nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div>
</div>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<nz-tab nzTitle="待审批">
<nz-table #basicTable [nzData]="noList">
<thead>
<tr>
<th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of noList">
<td nzShowCheckbox [(nzChecked)]="data.checked" [nzDisabled]="data.disabled" (nzCheckedChange)="refreshStatus($event)"></td>
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
<nz-tab nzTitle="已审批">
<nz-table #basicTable [nzData]="areadyList">
<thead>
<tr>
<th>操作用户</th>
<th>操作内容</th>
<th>提交时间</th>
<th>审核状态</th>
<th>审核人</th>
<th>审核时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
<td>
<span *ngIf="data.status == 0">审批通过</span>
<span *ngIf="data.status == 1">审批驳回</span>
<span *ngIf="data.status == 2">新增用户待审批</span>
<span *ngIf="data.status == 3">修改用户待审批</span>
<span *ngIf="data.status == 4">注销用户待审批</span>
<span *ngIf="data.status == 5">提交人主动撤回，进行重新提交或者删除当前提交</span>
<span *ngIf="data.status == 6">兼职待审批</span>
<span *ngIf="data.status == 7">撤销兼职待审批</span>
<span *ngIf="data.status == 8">改变组织待审批</span>
<span *ngIf="data.status == 9">改变组织退回</span>
<span *ngIf="data.status == 10">授予角色待审批</span>
<span *ngIf="data.status == 11">授予用户待审批</span>
<span *ngIf="data.status == 12">撤销角色待审批</span>
<span *ngIf="data.status == 13">撤销用户待审批</span>
<span *ngIf="data.status == 14">绑定组织待审批</span>
<span *ngIf="data.status == 15">冻结用户待审批</span>
<span *ngIf="data.status == 16">删除绑定组织待审批</span>
<span *ngIf="data.status == 17">恢复用户待审批</span>
<span *ngIf="data.status == 18">初始化密码待审批</span>
<span *ngIf="data.status == 19">复制用户待审批</span>
<span *ngIf="data.status == 20">置为临时角色待审批</span>
<span *ngIf="data.status == 21">置为永久角色待审批</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
src/main/webapp/app/system/modal/system/system.component.ts deleted 100644 → 0
View file @ ce8c43ad
import { Component, OnInit } from '@angular/core';
import {SystemService} from '../../system.service';
import {pageSize} from '../../../app.constants';
import {NzMessageService} from 'ng-zorro-antd';
@Component({
selector: 'smart-system',
templateUrl: './system.component.html',
styles: []
})
export class SystemComponent implements OnInit {
pageSize = pageSize;
//已审批
pageNoAlready = 1;
totalNumAlready;
areadyList = [];
//未审批
pageNoNo = 1;
totalNumNo;
noList = [];
allChecked;
indeterminate;
displayData = [];
constructor(private systemSer: SystemService,private message:NzMessageService) {
}
ngOnInit() {
this.getListAlready();
this.getListNo();
}
currentPageDataChange($event: Array<{ entityName: string; checked: boolean; disabled: boolean; }>): void {
this.displayData = $event;
this.refreshStatus();
}
refreshStatus(): void {
const allChecked = this.displayData.filter(value => !value.disabled).every(value => value.checked === true);
const allUnChecked = this.displayData.filter(value => !value.disabled).every(value => !value.checked);
this.allChecked = allChecked;
this.indeterminate = (!allChecked) && (!allUnChecked);
}
checkAll(value: boolean): void {
this.displayData.forEach(data => {
if (!data.disabled) {
data.checked = value;
}
});
this.refreshStatus();
}
getListAlready() {
const data = {
pageNo: this.pageNoAlready,
pageSize: this.pageSize
};
this.systemSer.approveListSafeManager(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.areadyList = res.data;
}else{
this.message.error(res.errMsg);
}
}
);
}
getListNo() {
const data = {
pageNo: this.pageNoNo,
pageSize: this.pageSize
};
this.systemSer.unApproveListSystemManager(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.noList = res.data;
}else{
this.message.error(res.errMsg);
}
}
);
}
}
src/main/webapp/app/system/system.service.ts
View file @ 02119bbd
......@@ -126,8 +126,8 @@ export class SystemService {
}
//获取当前登录人角色
currentUserRoles(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/role/currentUserRoles');
checkRole(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/role/checkRole');
}
//单个用户角色获取
......@@ -135,9 +135,9 @@ export class SystemService {
return this.http.get(SERVER_API_URL_COMS + '/user/roleList?'+this.commonSer.toQuery(data) );
}
//获取当前安全管理员已审批记录
approveListSafeManager(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/approval/approveListSafeManager?'+this.commonSer.toQuery(data) );
//获取当前已审批记录
getApproveOfDone(data): Observable<any>{
return this.http.post(SERVER_API_URL_COMS + '/approve/getApproveOfDone',data );
}
//获取当前安全管理员未审批记录
......@@ -145,11 +145,6 @@ export class SystemService {
return this.http.get(SERVER_API_URL_COMS + '/approval/unapproveListSafeManager?'+this.commonSer.toQuery(data) );
}
//获取当前系统管理员的已审批记录
approveListSystemManager(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/approval/approveListSystemManager?'+this.commonSer.toQuery(data) );
}
//获取当前系统管理员的未审批记录
unApproveListSystemManager(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/approval/unApproveListSystemManager?'+this.commonSer.toQuery(data) );
......@@ -212,4 +207,9 @@ export class SystemService {
closeAuth(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/separationConfig/closeAuth' );
}
//菜单列表
getMenuBySeparation(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/resources/getMenuBySeparation' );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment