Skip to content

S
smart
Commit 0aa7d94f authored by wangqinghua's avatar wangqinghua
Browse files
Options

时间

parent 6a98bce7
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 35 deletions
src/main/webapp/app/alarm/alarm-list/alarm-list.component.ts
View file @ 0aa7d94f
...@@ -108,14 +108,14 @@ export class AlarmListComponent implements OnInit { ...@@ -108,14 +108,14 @@ export class AlarmListComponent implements OnInit {
} }
case'3': { case'3': {
day1 = nowDate - 3 * 24 * 60 * 60 * 1000; day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
} }
case'4': { case'4': {
day1 = nowDate - 7 * 24 * 60 * 60 * 1000; day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
......
src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.ts
View file @ 0aa7d94f
...@@ -276,14 +276,14 @@ export class ResourceAlarmComponent implements OnInit { ...@@ -276,14 +276,14 @@ export class ResourceAlarmComponent implements OnInit {
} }
case'3': { case'3': {
day1 = nowDate - 3 * 24 * 60 * 60 * 1000; day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
} }
case'4': { case'4': {
day1 = nowDate - 7 * 24 * 60 * 60 * 1000; day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
......
src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.ts
View file @ 0aa7d94f
...@@ -167,14 +167,14 @@ export class ResourceUsabilComponent implements OnInit { ...@@ -167,14 +167,14 @@ export class ResourceUsabilComponent implements OnInit {
} }
case'3': { case'3': {
day1 = nowDate - 3 * 24 * 60 * 60 * 1000; day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
} }
case'4': { case'4': {
day1 = nowDate - 7 * 24 * 60 * 60 * 1000; day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
......
src/main/webapp/app/modal/basi-check/basi-check.component.ts
View file @ 0aa7d94f
...@@ -192,7 +192,7 @@ export class BasiCheckComponent implements OnInit { ...@@ -192,7 +192,7 @@ export class BasiCheckComponent implements OnInit {
if (this.title == '添加监测点' || this.title == "添加模版监测点") { if (this.title == '添加监测点' || this.title == "添加模版监测点") {
this.create(); this.create();
} }
if (this.title == '编辑监测点') { if (this.title == '编辑监测点' || this.title == "编辑模版监测点") {
this.update(); this.update();
} }
} }
......
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.ts
View file @ 0aa7d94f
...@@ -79,8 +79,6 @@ export class FlowTrendComponent implements OnInit, OnDestroy { ...@@ -79,8 +79,6 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
this.obj.hostid = null; this.obj.hostid = null;
this.onchange(); this.onchange();
this.getInList();
this.getOutList();
} }
getListIO() { getListIO() {
...@@ -130,6 +128,8 @@ export class FlowTrendComponent implements OnInit, OnDestroy { ...@@ -130,6 +128,8 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
this.getEcharts(null); this.getEcharts(null);
this.findByTime(); this.findByTime();
this.setNowEchart(); this.setNowEchart();
this.getInList();
this.getOutList();
} else { } else {
this.message.warning('当前资源组无资源'); this.message.warning('当前资源组无资源');
} }
...@@ -587,14 +587,14 @@ export class FlowTrendComponent implements OnInit, OnDestroy { ...@@ -587,14 +587,14 @@ export class FlowTrendComponent implements OnInit, OnDestroy {
} }
case'3': { case'3': {
day1 = nowDate - 3 * 24 * 60 * 60 * 1000; day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
} }
case'4': { case'4': {
day1 = nowDate - 7 * 24 * 60 * 60 * 1000; day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
......
src/main/webapp/app/netTopology/topology-img/topology-img.component.html
View file @ 0aa7d94f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
<div nz-row class="search-form"> <div nz-row class="search-form">
<div nz-col nzSpan="12"> <div nz-col nzSpan="12">
<!--<button nz-button (click)="addIcon()" nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加图标</button>--> <button nz-button (click)="addIcon()" nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加图标</button>
</div> </div>
</div> </div>
<nz-table #nzTable [nzData]="iconList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changePage($event)"> <nz-table #nzTable [nzData]="iconList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changePage($event)">
......
src/main/webapp/app/overAll/basic/basic.component.html
View file @ 0aa7d94f
...@@ -123,23 +123,29 @@ ...@@ -123,23 +123,29 @@
<td class="default"> <td class="default">
<ng-container *ngIf="item.level"> <ng-container *ngIf="item.level">
<ng-container *ngIf="item.available == 0"> <ng-container *ngIf="item.available == 0">
<nz-tag>AGENT</nz-tag> <nz-tag>AGENT</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.available == 1"> <ng-container *ngIf="item.available == 1">
<nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag> <nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.available == 2"> <ng-container *ngIf="item.available == 2">
<nz-tag [nzColor]="'#d44f51'">AGENT</nz-tag> <nz-tooltip [nzTitle]="item.error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">AGENT</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 0"> <ng-container *ngIf="item.snmp_available == 0">
<nz-tag>SNMP</nz-tag> <nz-tooltip [nzTitle]="item?.snmp_error">
<nz-tag>SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 1"> <ng-container *ngIf="item.snmp_available == 1">
<nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag> <nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 2"> <ng-container *ngIf="item.snmp_available == 2">
<nz-tag [nzColor]="'#d44f51'">SNMP</nz-tag> <nz-tooltip [nzTitle]="item.snmp_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 0"> <ng-container *ngIf="item.jmx_available == 0">
...@@ -149,7 +155,9 @@ ...@@ -149,7 +155,9 @@
<nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag> <nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 2"> <ng-container *ngIf="item.jmx_available == 2">
<nz-tag [nzColor]="'#d44f51'">JMX</nz-tag> <nz-tooltip [nzTitle]="item.jmx_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">JMX</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 0"> <ng-container *ngIf="item.ipmi_available == 0">
...@@ -159,7 +167,9 @@ ...@@ -159,7 +167,9 @@
<nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag> <nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 2"> <ng-container *ngIf="item.ipmi_available == 2">
<nz-tag [nzColor]="'#d44f51'">IPMI</nz-tag> <nz-tooltip [nzTitle]="item.ipmi_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">IPMI</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
</ng-container> </ng-container>
</td> </td>
...@@ -235,17 +245,23 @@ ...@@ -235,17 +245,23 @@
<nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag> <nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.available == 2"> <ng-container *ngIf="item.available == 2">
<nz-tag [nzColor]="'#d44f51'">AGENT</nz-tag> <nz-tooltip [nzTitle]="item.error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">AGENT</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 0"> <ng-container *ngIf="item.snmp_available == 0">
<nz-tag>SNMP</nz-tag> <nz-tooltip [nzTitle]="item?.snmp_error">
<nz-tag>SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 1"> <ng-container *ngIf="item.snmp_available == 1">
<nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag> <nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 2"> <ng-container *ngIf="item.snmp_available == 2">
<nz-tag [nzColor]="'#d44f51'">SNMP</nz-tag> <nz-tooltip [nzTitle]="item.snmp_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 0"> <ng-container *ngIf="item.jmx_available == 0">
...@@ -255,8 +271,11 @@ ...@@ -255,8 +271,11 @@
<nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag> <nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 2"> <ng-container *ngIf="item.jmx_available == 2">
<nz-tag [nzColor]="'#d44f51'">JMX</nz-tag> <nz-tooltip [nzTitle]="item.jmx_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">JMX</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 0"> <ng-container *ngIf="item.ipmi_available == 0">
<nz-tag>IPMI</nz-tag> <nz-tag>IPMI</nz-tag>
</ng-container> </ng-container>
...@@ -264,7 +283,9 @@ ...@@ -264,7 +283,9 @@
<nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag> <nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 2"> <ng-container *ngIf="item.ipmi_available == 2">
<nz-tag [nzColor]="'#d44f51'">IPMI</nz-tag> <nz-tooltip [nzTitle]="item.ipmi_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">IPMI</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
</ng-container> </ng-container>
</td> </td>
...@@ -330,17 +351,23 @@ ...@@ -330,17 +351,23 @@
<nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag> <nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.available == 2"> <ng-container *ngIf="item.available == 2">
<nz-tag [nzColor]="'#d44f51'">AGENT</nz-tag> <nz-tooltip [nzTitle]="item.error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">AGENT</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 0"> <ng-container *ngIf="item.snmp_available == 0">
<nz-tag>SNMP</nz-tag> <nz-tooltip [nzTitle]="item?.snmp_error">
<nz-tag>SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 1"> <ng-container *ngIf="item.snmp_available == 1">
<nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag> <nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.snmp_available == 2"> <ng-container *ngIf="item.snmp_available == 2">
<nz-tag [nzColor]="'#d44f51'">SNMP</nz-tag> <nz-tooltip [nzTitle]="item.snmp_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">SNMP</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 0"> <ng-container *ngIf="item.jmx_available == 0">
...@@ -350,7 +377,9 @@ ...@@ -350,7 +377,9 @@
<nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag> <nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.jmx_available == 2"> <ng-container *ngIf="item.jmx_available == 2">
<nz-tag [nzColor]="'#d44f51'">JMX</nz-tag> <nz-tooltip [nzTitle]="item.jmx_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">JMX</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 0"> <ng-container *ngIf="item.ipmi_available == 0">
...@@ -360,7 +389,9 @@ ...@@ -360,7 +389,9 @@
<nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag> <nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag>
</ng-container> </ng-container>
<ng-container *ngIf="item.ipmi_available == 2"> <ng-container *ngIf="item.ipmi_available == 2">
<nz-tag [nzColor]="'#d44f51'">IPMI</nz-tag> <nz-tooltip [nzTitle]="item.ipmi_error">
<nz-tag nz-tooltip [nzColor]="'#d44f51'">IPMI</nz-tag>
</nz-tooltip>
</ng-container> </ng-container>
</td> </td>
<td class="handle main-color"> <td class="handle main-color">
......
src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.ts
View file @ 0aa7d94f
...@@ -137,14 +137,14 @@ export class NetworkDetailComponent implements OnInit, OnChanges { ...@@ -137,14 +137,14 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
} }
case'3': { case'3': {
day1 = nowDate - 3 * 24 * 60 * 60 * 1000; day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
} }
case'4': { case'4': {
day1 = nowDate - 7 * 24 * 60 * 60 * 1000; day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
day2 = nowDate - 1 * 24 * 60 * 60 * 1000; day2 = nowDate;
this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00'; 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'; this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
break; break;
......
src/main/webapp/content/css/global.css
View file @ 0aa7d94f
...@@ -324,10 +324,10 @@ ui bootstrap tweaks ...@@ -324,10 +324,10 @@ ui bootstrap tweaks
border: 1px solid #ddd; border: 1px solid #ddd;
color: red; color: red;
} }
.ant-tooltip-placement-left .ant-tooltip-arrow{ .ant-tooltip-placement-left .ant-tooltip-arrow,
border-left-color:#dddddd; .ant-tooltip-placement-bottom .ant-tooltip-arrow,
} .ant-tooltip-placement-right .ant-tooltip-arrow,
.ant-tooltip-placement-bottom .ant-tooltip-arrow{ .ant-tooltip-placement-top .ant-tooltip-arrow{
border-bottom-color:#dddddd; border-bottom-color:#dddddd;
} }
.table-dropdown a, .table-dropdown a,
......
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