Skip to content

S
smart
Commit 327d3283 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent aa2dc27f
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 70 deletions
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html
View file @ 327d3283
......@@ -13,7 +13,7 @@
</nz-breadcrumb>
</div>
<div nz-col nzSpan="8" class="text-right">
<button nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
<button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
</div>
......@@ -33,33 +33,33 @@
</ng-container>
</nz-select>
</div>
<!--<div nz-col nzSpan="7">-->
<!--<nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()"-->
<!--[nzButtonStyle]="'solid'">-->
<!--<label nz-radio-button nzValue="1">今天</label>-->
<!--<label nz-radio-button nzValue="2">昨天</label>-->
<!--<label nz-radio-button nzValue="3">三天</label>-->
<!--<label nz-radio-button nzValue="4">一周</label>-->
<!--<label nz-radio-button nzValue="5">自定义</label>-->
<!--</nz-radio-group>-->
<!--</div>-->
<!--<div nz-col nzSpan="8" *ngIf="timeType == '5'">-->
<!--<nz-date-picker-->
<!--nzShowTime-->
<!--[(ngModel)]="obj.time_from"-->
<!--nzPlaceHolder="开始时间"-->
<!--&gt;</nz-date-picker>-->
<!--<nz-date-picker-->
<!--nzShowTime-->
<!--nzFormat="yyyy-MM-dd HH:mm:ss"-->
<!--[(ngModel)]="obj.time_till"-->
<!--nzPlaceHolder="结束时间"-->
<!--&gt;</nz-date-picker>-->
<!--</div>-->
<div nz-col nzSpan="7">
<nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()"
[nzButtonStyle]="'solid'">
<label nz-radio-button nzValue="1">今天</label>
<label nz-radio-button nzValue="2">昨天</label>
<label nz-radio-button nzValue="3">三天</label>
<label nz-radio-button nzValue="4">一周</label>
<label nz-radio-button nzValue="5">自定义</label>
</nz-radio-group>
</div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
[(ngModel)]="timeBegin"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="timeEnd"
nzPlaceHolder="结束时间"
></nz-date-picker>
</div>
</div>
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<nz-tab nzTitle="接收流量排行">
<nz-table #nzTable [nzData]="inList" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="getInList()">
<nz-table #nzTable [nzData]="inList" [nzLoading]="" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="getInList()">
<thead>
<tr>
<th nzWidth="20%">监测点名称</th>
......
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.ts
View file @ 327d3283
......@@ -27,22 +27,28 @@ export class FlowTrendComponent implements OnInit {
inPageNum = 1;
inPageCount = pageSize;
inTotalNum;
inLoading;
//out
outList = [];
outPageNum = 1;
outPageCount = pageSize;
outTotalNum;
outLoading;
timeType = "1";
timeBegin;
timeEnd;
constructor(private topologySer: TopologyService, private overAllSer: OverAllService,
private message: NzMessageService,private dataPipe:DatePipe) {
private message: NzMessageService,private datePipe:DatePipe) {
}
ngOnInit() {
this.getGroup();
const today = new Date().getTime();
this.obj.startTime = this.dataPipe.transform(today,"yyyy-MM-dd") + " 00:00:00";
this.obj.endTime = this.dataPipe.transform(today,"yyyy-MM-dd") + " 23:59:59";
this.obj.startTime = this.datePipe.transform(today,"yyyy-MM-dd") + " 00:00:00";
this.obj.endTime = this.datePipe.transform(today,"yyyy-MM-dd") + " 23:59:59";
}
//获取分组
......@@ -88,6 +94,7 @@ export class FlowTrendComponent implements OnInit {
//获取流量
getList(e) {
this.obj.hostid = null;
this.onchange(e);
this.getInList();
this.getOutList();
......@@ -100,10 +107,11 @@ export class FlowTrendComponent implements OnInit {
//进口流量
getInList() {
this.inLoading = true;
const data = {
type: 'in',
pageNum: '1',
pageCount: '10',
pageNum: this.inPageNum,
pageCount: this.inPageCount,
hostid: this.obj.hostid,
startTime: this.obj.startTime,
endTime: this.obj.endTime,
......@@ -116,16 +124,18 @@ export class FlowTrendComponent implements OnInit {
} else {
this.message.warning(res.errMsg);
}
this.inLoading = false;
}
);
}
//出口流量
getOutList() {
this.outLoading = true;
const data = {
type: 'out',
pageNum: '1',
pageCount: '10',
pageNum: this.outPageNum,
pageCount: this.outPageCount,
hostid: this.obj.hostid,
startTime: this.obj.startTime,
endTime: this.obj.endTime,
......@@ -138,8 +148,55 @@ export class FlowTrendComponent implements OnInit {
} else {
this.message.warning(res.errMsg);
}
this.outLoading = false;
}
);
}
//时间改变
changeType(){
const nowDate = new Date().getTime();
let day1,day2;
switch (this.timeType){
case'1':{
this.obj.startTime = this.datePipe.transform(nowDate,'yyyy-MM-dd') +' 00:00:00';
this.obj.endTime = this.datePipe.transform(nowDate,'yyyy-MM-dd') +' 23:59:59';
break;
}
case'2':{
day1 = nowDate - 1*24*60*60*1000;
this.obj.startTime = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 23:59:59';
break;
}
case'3':{
day1 = nowDate - 3*24*60*60*1000;
day2 = nowDate - 1*24*60*60*1000;
this.obj.startTime = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(day2,'yyyy-MM-dd') + ' 23:59:59';
break;
}
case'4':{
day1 = nowDate - 7*24*60*60*1000;
day2 = nowDate - 1*24*60*60*1000;
this.obj.startTime = this.datePipe.transform(day1,'yyyy-MM-dd') + ' 00:00:00';
this.obj.endTime = this.datePipe.transform(day2,'yyyy-MM-dd') + ' 23:59:59';
break;
}
case'5':{
break;
}
}
}
//搜索
search(){
if(this.timeType == '5'){
this.obj.startTime = this.datePipe.transform(this.timeBegin,'yyyy-MM-dd HH:mm:ss');
this.obj.endTime = this.datePipe.transform(this.timeEnd,'yyyy-MM-dd HH:mm:ss');
}
this.getInList();
this.getOutList();
}
}
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.html
View file @ 327d3283
......@@ -327,23 +327,6 @@
<form id="link-form" class="layui-form" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">线类型</label>
<div class="layui-input-block">
<select name="textPosition">
<option value="0">无</option>
<option value="1">———</option>
<option value="2">· · · ·</option>
<option value="dashedPattern">- - - -</option>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">线宽</label>
<div class="layui-input-block">
<input type="text" name="lineWidth" required autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">名称</label>
<div class="layui-input-block">
<input type="text" name="lineName" required autocomplete="off" class="layui-input">
......@@ -351,23 +334,11 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">x1</label>
<div class="layui-input-inline" style="width: 60px;">
<input type="text" name="x1" placeholder="X" autocomplete="off" class="layui-input">
</div>
<label class="layui-form-label">y1</label>
<div class="layui-input-inline" style="width: 60px;">
<input type="text" name="y1" placeholder="Y" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">x2</label>
<div class="layui-input-inline" style="width: 60px;">
<input type="text" name="x2" placeholder="X" autocomplete="off" class="layui-input">
</div>
<label class="layui-form-label">y2</label>
<div class="layui-input-inline" style="width: 60px;">
<input type="text" name="y2" placeholder="Y" autocomplete="off" class="layui-input">
<div class="layui-inline">
<label class="layui-form-label">线条颜色</label>
<div class="layui-input-block">
<input type="color" name="lineColor" required autocomplete="off" class="layui-input">
</div>
</div>
</div>
</form>
......
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts
View file @ 327d3283
......@@ -167,6 +167,8 @@ export class NeTopologyComponent implements OnInit, AfterViewInit {
);
}
//查询监控点状态
//删除拓扑图
deleteTopo() {
if(!this.topoId){
......
src/main/webapp/app/netTopology/topology.service.ts
View file @ 327d3283
......@@ -83,4 +83,9 @@ export class TopologyService {
findTrend(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/trend/findTrend',data);
}
//根据元素ID集合查询监测点状态
findElementStatus(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/sysmapJson/findElementStatus',data);
}
}
src/main/webapp/app/system/group/group.component.html
View file @ 327d3283
......@@ -63,9 +63,9 @@
<tbody>
<tr *ngFor="let data of basicTable.data">
<td nzShowCheckbox [(nzChecked)]="data.checked" (nzCheckedChange)="refreshStatus($event)"></td>
<td>{{data.key1}}</td>
<td>{{data.key2}}</td>
<td>{{data.key3}}</td>
<td>{{data.name}}</td>
<td>{{data.loginName}}</td>
<td>{{data.mobile}}</td>
<td>{{data.key4}}</td>
<td class="handle">
<span>查看</span>
......
src/main/webapp/app/system/system.service.ts
View file @ 327d3283
......@@ -32,7 +32,7 @@ export class SystemService {
//用户列表
user(data): Observable<any>{
return this.http.get(SERVER_API_URL + '/user?' + this.toTree.toQuery(data));
return this.http.post(SERVER_API_URL + '/user/findUsers',data);
}
//新增用户
......
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