Skip to content

S
smart
Commit 6726f1b4 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 02119bbd
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 340 deletions
src/main/webapp/app/alarm/send-set/send-set.component.html
View file @ 6726f1b4
......@@ -36,7 +36,6 @@
<tbody>
<tr *ngFor="let data of sendList">
<td class="round-tag tag-form">
<nz-tag [nzColor]="color.red"></nz-tag>
{{data.description}}
</td>
<td>
......
src/main/webapp/app/layouts/layout.service.ts
View file @ 6726f1b4
......@@ -9,10 +9,12 @@ export class LayoutService {
constructor(private http: HttpClient) {
}
//当前登录人菜单
getMenu(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/resources/getMenu');
}
//所有菜单
getAllMenu(): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + "/resources/getAll");
}
......
src/main/webapp/app/layouts/sidebar/sidebar.component.ts
View file @ 6726f1b4
......@@ -16,251 +16,7 @@ import {CommonService} from '../../shared/common/common.service';
})
export class SidebarComponent implements OnInit {
token: boolean;
menuList = [{
"id": "61fbf8d185184cd0ad3afb071c350f35",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "综合监控",
"code": "monitor",
"url": "",
"imageUrl": "zhjk",
"showOrder": 2,
"checked":false,
}, {
"id": "gc44aacf0db14ac28f0189b6d68d8097",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "告警管理",
"code": "warning",
"url": null,
"imageUrl": "gjgl",
"showOrder": 3,
"checked":false,
}, {
"id": "ed8ad2d8aca64d1ea896fb659b64b258",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "网络拓扑",
"code": "networkTopology",
"url": null,
"imageUrl": "wltp",
"showOrder": 4,
"checked":false,
}, {
"id": "844f455d4e11448cad99f40a913980f9",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "统计分析",
"code": "analysis",
"url": null,
"imageUrl": "tjfx",
"showOrder": 5,
"checked":false,
}, {
"id": "0b117c84245a4e2ea8a47696cf2a84c3",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "运维工作",
"code": "work",
"url": null,
"imageUrl": "ywgz",
"showOrder": 7,
"checked":false,
}, {
"id": "0050d077f2ef4f3ab7289bf7d0f215ed",
"parentId": "b9a99765784c44378141c789fd8e8c80",
"name": "系统管理",
"code": "systemManage",
"url": "",
"imageUrl": "xtgl",
"showOrder": 9,
"checked":false,
}, {
"id": "74f82e90eb954cfbb3899cb3a1309d9f",
"parentId": "61fbf8d185184cd0ad3afb071c350f35",
"name": "基础资源监控",
"code": "basicMonitor",
"url": "basic",
"imageUrl": null,
"showOrder": 20,
"checked":false,
}, {
"id": "4344ebab149f432785d68ba44808cef4",
"parentId": "61fbf8d185184cd0ad3afb071c350f35",
"name": "网站监测",
"code": "networkCheck",
"url": "networkCheck",
"imageUrl": null,
"showOrder": 23,
"checked":false,
}, {
"id": "8046ff846b084444a17ace798d5edd54",
"parentId": "gc44aacf0db14ac28f0189b6d68d8097",
"name": "当前告警",
"code": "currentWarning",
"url": "nowAlarm",
"imageUrl": null,
"showOrder": 30,
"checked":false,
}, {
"id": "fea1222fe75e4c47b2376712c1f85c92",
"parentId": "gc44aacf0db14ac28f0189b6d68d8097",
"name": "告警记录",
"code": "warningReport",
"url": "alarmList",
"imageUrl": null,
"showOrder": 31,
"checked":false,
}, {
"id": "f610f1243374404ca61d60c58d3c1acc",
"parentId": "gc44aacf0db14ac28f0189b6d68d8097",
"name": "告警推送日志",
"code": "warningLog",
"url": "alarmLog",
"imageUrl": null,
"showOrder": 32,
"checked":false,
}, {
"id": "079f2fd721a7413dba4b884db7f548d1",
"parentId": "gc44aacf0db14ac28f0189b6d68d8097",
"name": "告警推送设置",
"code": "warningSet",
"url": "alarmSet",
"imageUrl": null,
"showOrder": 33,
"checked":false,
}, {
"id": "945de8965e2547db8d1622d990abf8bf",
"parentId": "gc44aacf0db14ac28f0189b6d68d8097",
"name": "发送推送设置",
"code": "sendSet",
"url": "sendSet",
"imageUrl": null,
"showOrder": 34,
"checked":false,
}, {
"id": "35cfe93b5abd40b0a628d9efe458acc6",
"parentId": "ed8ad2d8aca64d1ea896fb659b64b258",
"name": "网络拓扑图",
"code": "neTopology",
"url": "neTopology",
"imageUrl": null,
"showOrder": 40,
"checked":false,
}, {
"id": "4927d17f0fef48469212e6095663750b",
"parentId": "ed8ad2d8aca64d1ea896fb659b64b258",
"name": "拓扑图标管理",
"code": "topoImg",
"url": "topoImg",
"imageUrl": null,
"showOrder": 41,
"checked":false,
}, {
"id": "6cf6928899c0482496d6a6d96b9a1f8c",
"parentId": "ed8ad2d8aca64d1ea896fb659b64b258",
"name": "流量趋势",
"code": "flowTrend",
"url": "flowTrend",
"imageUrl": null,
"showOrder": 42,
"checked":false,
}, {
"id": "6b4e1efa60a5411ba9f0721521aeeef0",
"parentId": "844f455d4e11448cad99f40a913980f9",
"name": "资源告警统计",
"code": "resourceAlarm",
"url": "resourceAlarm",
"imageUrl": null,
"showOrder": 50,
"checked":false,
}, {
"id": "68aac639bec6467d8fd4a52d9184504f",
"parentId": "844f455d4e11448cad99f40a913980f9",
"name": "资源可用性统计",
"code": "resourceUsabil",
"url": "resourceUsabil",
"imageUrl": null,
"showOrder": 51,
"checked":false,
}, {
"id": "2c529665252341bebd289c2758b66ad2",
"parentId": "844f455d4e11448cad99f40a913980f9",
"name": "运维工作统计",
"code": "operationWork",
"url": "operationWork",
"imageUrl": null,
"showOrder": 53,
"checked":false,
}, {
"id": "f94960af576c4bd99cbbbb4a9020f5f1",
"parentId": "0b117c84245a4e2ea8a47696cf2a84c3",
"name": "事件处置",
"code": "workHandle",
"url": "workHandle",
"imageUrl": null,
"showOrder": 70,
"checked":false,
}, {
"id": "d7209f1d3a8b4f02ae8fc3f8b30b8aa1",
"parentId": "0b117c84245a4e2ea8a47696cf2a84c3",
"name": "巡检计划",
"code": "inspectPlan",
"url": "inspectPlan",
"imageUrl": null,
"showOrder": 71,
"checked":false,
}, {
"id": "3e864a2900574eb289816e74f576a439",
"parentId": "0b117c84245a4e2ea8a47696cf2a84c3",
"name": "资产备件",
"code": "assetPart",
"url": "assetPart",
"imageUrl": null,
"showOrder": 74,
"checked":false,
}, {
"id": "3e864a2900574eb279816e74f576a439",
"parentId": "0b117c84245a4e2ea8a47696cf2a84c3",
"name": "参数配置",
"code": "params",
"url": "params",
"imageUrl": null,
"showOrder": 75,
"checked":false,
},{
"id": "1d17dc2e439f4fd9a3037a619c3eb275",
"parentId": "0050d077f2ef4f3ab7289bf7d0f215ed",
"name": "组织用户",
"code": "organizationUser",
"url": "group",
"imageUrl": null,
"showOrder": 90,
"checked":false,
}, {
"id": "3ca073e2c3a24a0fadef89e204ff0dfc",
"parentId": "0050d077f2ef4f3ab7289bf7d0f215ed",
"name": "角色与权限",
"code": "role",
"url": "power",
"imageUrl": null,
"showOrder": 91,
"checked":false,
}, {
"id": "3dba52e512034b3188f6fc0dc77d88dc",
"parentId": "0050d077f2ef4f3ab7289bf7d0f215ed",
"name": "系统审计",
"code": "systemCount",
"url": "audit",
"imageUrl": null,
"showOrder": 92,
"checked":false,
}, {
"id": "5cf71cff20eb46909c966a11329c35ec",
"parentId": "0050d077f2ef4f3ab7289bf7d0f215ed",
"name": "审核管理",
"code": "approveManage",
"url": "examine",
"imageUrl": null,
"showOrder": 93,
"checked":false,
}];
menuList = [];
constructor(public router: Router, private http: Http,
public layoutSer: LayoutService,
......
src/main/webapp/app/shared/login/login.component.ts
View file @ 6726f1b4
......@@ -84,7 +84,7 @@ export class JhiLoginModalComponent implements OnInit {
this.loginService.login(this.validateForm.value).then((res) => {
this.isSpinning = false;
if(res){
this.router.navigate(['app/main/basic']);
this.router.navigate(['app/main/home']);
this.notification.create('success', '登录成功','',{nzDuration:2000});
this.$localStorage.store('userInfo', this.validateForm.value);
}else{
......
src/main/webapp/app/system/audit/audit.component.html
View file @ 6726f1b4
......@@ -41,25 +41,20 @@
<nz-table #basicTable [nzData]="dataSet">
<thead>
<tr>
<th>系统时间</th>
<th>用户</th>
<th>IP地址</th>
<th>操作模块</th>
<th>详情</th>
<th>资源</th>
<th>操作用户</th>
<th>功能模块</th>
<th>操作</th>
<th>操作内容</th>
<th>操作时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.key1}}</td>
<td>{{data.key2}}</td>
<td>{{data.key3}}</td>
<td>{{data.key4}}</td>
<td>{{data.key5}}</td>
<td>
<span>详情</span>
</td>
<td>{{data.createUserName}}</td>
<td>{{data.moduleName}}</td>
<td>{{data.content}}</td>
<td>{{data.content}}</td>
<td>{{data.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
</tr>
</tbody>
</nz-table>
src/main/webapp/app/system/audit/audit.component.ts
View file @ 6726f1b4
......@@ -22,11 +22,11 @@ export class AuditComponent implements OnInit {
getList(){
const data = {
pageSize:this.pageSize,
pageNumber:this.pageNumber,
endDate:"",
startDate:"",
name:"",
type:""
pageNum:this.pageNumber,
end:null,
start:null,
content:null,
moduleId:null
}
this.systemSer.logList(data).subscribe(
(res)=>{
......
src/main/webapp/app/system/examine/examine.component.html
View file @ 6726f1b4
......@@ -20,10 +20,12 @@
<div nz-row class="search-form">
<div nz-col nzSpan="16">
<button (click)="approvalPass()" nz-button nzType="default"><i class="anticon anticon-check-circle-o"></i>通过</button>
<button (click)="approvalUnPass()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>退回</button>
</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>
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div>
</div>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
......@@ -42,36 +44,38 @@
</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 nzShowCheckbox [(nzChecked)]="data.checked" [nzDisabled]="data.disabled" (nzCheckedChange)="selectItem(data,$event)"></td>
<td>{{data.createUserName}}</td>
<td>{{data.comment}}</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>
<!--<span *ngIf="data.status == 0">审批通过</span>-->
<span *ngIf="data.status == 0">未审核</span>
<span *ngIf="data.status == 1">撤回</span>
<span *ngIf="data.status == 2">通过</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>
<td>{{data.checkUserName}}</td>
<td>{{data.chechTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
</tr>
</tbody>
</nz-table>
......@@ -90,35 +94,17 @@
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.entityName}}</td>
<td>{{data.key2}}</td>
<td>{{data.createUserName}}</td>
<td>{{data.comment}}</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>
<span *ngIf="data.status == 0">未审核</span>
<span *ngIf="data.status == 1">撤回</span>
<span *ngIf="data.status == 2">通过</span>
<span *ngIf="data.status == 2">失败</span>
</td>
<td>{{data.key5}}</td>
<td>{{data.key6}}</td>
<td>{{data.checkUserName}}</td>
<td>{{data.chechTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
</tr>
</tbody>
</nz-table>
......
src/main/webapp/app/system/examine/examine.component.ts
View file @ 6726f1b4
......@@ -2,6 +2,8 @@ import {Component, OnInit} from '@angular/core';
import {SystemService} from '../system.service';
import {pageSize} from '../../app.constants';
import {NzMessageService} from 'ng-zorro-antd';
import {CommonService} from '../../shared/common/common.service';
import {LayoutService} from '../../layouts/layout.service';
@Component({
selector: 'jhi-examine',
......@@ -26,7 +28,13 @@ export class ExamineComponent implements OnInit {
indeterminate;
displayData = [];
constructor(private systemSer: SystemService,private message:NzMessageService) {
selectList = [];
menuList = [];
roleType; //1.系统管理员 2.安全管理员 3。二者都有
constructor(private systemSer: SystemService,private message:NzMessageService,private commonSer:CommonService,
private layoutSer:LayoutService) {
}
currentPageDataChange($event: Array<{ entityName: string; checked: boolean; disabled: boolean; }>): void {
......@@ -34,6 +42,19 @@ export class ExamineComponent implements OnInit {
this.refreshStatus();
}
selectItem(item,e){
if(e){
this.selectList.push(item.id);
}else{
this.selectList.forEach((value,index)=>{
if(value.id == item.id){
this.selectList.splice(index,1)
}
});
}
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);
......@@ -52,19 +73,36 @@ export class ExamineComponent implements OnInit {
ngOnInit(){
this.getCurrentRole();
this.getListAlready();
this.getListNo();
}
/**
* 获取所有菜单
*/
getAllMenu(){
this.layoutSer.getAllMenu().subscribe(
(res)=>{
this.menuList = res.data;
}
)
}
/**
* 获取当前登录人角色
* 1.系统管理员 2.安全管理员 3。二者都有
*/
getCurrentRole(){
this.systemSer.checkRole().subscribe(
(res)=>{
this.roleType = res.data;
}
)
}
getListAlready() {
const data = {
pageNo: this.pageNoAlready,
pageNum: this.pageNoAlready,
pageSize: this.pageSize,
name:this.name
};
......@@ -81,11 +119,11 @@ export class ExamineComponent implements OnInit {
getListNo() {
const data = {
pageNo: this.pageNoNo,
pageNum: this.pageNoNo,
pageSize: this.pageSize,
name:this.name
};
this.systemSer.unApproveListSystemManager(data).subscribe(
this.systemSer.getUnApprove(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.noList = res.data;
......@@ -96,4 +134,40 @@ export class ExamineComponent implements OnInit {
);
}
//审批通过
approvalPass(){
this.commonSer.deleteThing("确定通过所选请求",()=>{
this.systemSer.approvalPass(this.selectList).subscribe(
(res)=>{
if(res.errCode == 10000){
this.message.success("已通过");
}else{
this.message.error(res.errMsg);
}
}
)
})
}
//审批不通过
approvalUnPass(){
this.commonSer.deleteThing("确定拒绝所选请求",()=>{
this.systemSer.approvCancle(this.selectList).subscribe(
(res)=>{
if(res.errCode == 10000){
this.message.success("退回成功");
}else{
this.message.error(res.errMsg);
}
}
)
})
}
search(){
this.getListAlready();
}
}
src/main/webapp/app/system/system.service.ts
View file @ 6726f1b4
......@@ -92,7 +92,7 @@ export class SystemService {
//审计列表
logList(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/log?'+this.commonSer.toQuery(data));
return this.http.post(SERVER_API_URL_COMS + '/log/getLog',data);
}
//单个角色to多个用户
......@@ -140,24 +140,19 @@ export class SystemService {
return this.http.post(SERVER_API_URL_COMS + '/approve/getApproveOfDone',data );
}
//获取当前安全管理员未审批记录
unapproveListSafeManager(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/approval/unapproveListSafeManager?'+this.commonSer.toQuery(data) );
//获取未审批记录
getUnApprove(data): Observable<any>{
return this.http.post(SERVER_API_URL_COMS + '/approve/getUnApprove',data );
}
//获取当前系统管理员的未审批记录
unApproveListSystemManager(data): Observable<any>{
return this.http.get(SERVER_API_URL_COMS + '/approval/unApproveListSystemManager?'+this.commonSer.toQuery(data) );
}
//批量审批通过
//审批通过
approvalPass(data): Observable<any>{
return this.http.post(SERVER_API_URL_COMS + '/approval/pass', data);
return this.http.post(SERVER_API_URL_COMS + '/approve/pass', data );
}
//批量审批退回
approvalReject(data): Observable<any>{
return this.http.post(SERVER_API_URL_COMS + '/approval/reject', data);
//审批退回
approvCancle(data): Observable<any>{
return this.http.post(SERVER_API_URL_COMS + '/approve/cancle', data);
}
//批量撤回审批
......@@ -208,7 +203,7 @@ export class SystemService {
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