Skip to content

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

(click)="ngOnInit()"

parent 32457bc7
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 35 deletions
src/main/webapp/app/alarm/alarm-log/alarm-log.component.html
View file @ aa1c5319
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
<tbody> <tbody>
<tr *ngFor="let data of logList"> <tr *ngFor="let data of logList">
<td class="round-tag tag-form"> <td class="round-tag tag-form">
<!--<nz-tag [nzColor]="'#fc0d1b'"></nz-tag>-->
{{data.name}} {{data.name}}
</td> </td>
<td>{{data.clock | date:"yyyy-MM-dd HH:mm:ss"}}</td> <td>{{data.clock | date:"yyyy-MM-dd HH:mm:ss"}}</td>
......
src/main/webapp/app/app.route.ts
View file @ aa1c5319
...@@ -42,31 +42,31 @@ export const route: Routes = [ ...@@ -42,31 +42,31 @@ export const route: Routes = [
{ {
path: 'main', component: JhiMainComponent,canActivate:[LoginGuard],data: { breadcrumb: '首页' }, path: 'main', component: JhiMainComponent,canActivate:[LoginGuard],data: { breadcrumb: '首页' },
children: [ children: [
{path: 'home', component: HomeComponent}, {path: 'home', component: HomeComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'basic', component: BasicComponent}, {path: 'basic', component: BasicComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'basic-detail', component: BasicDetailComponent}, {path: 'basic-detail', component: BasicDetailComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'networkCheck', component: NetworkCheckComponent}, {path: 'networkCheck', component: NetworkCheckComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'network-detail', component: NetworkDetailComponent}, {path: 'network-detail', component: NetworkDetailComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'audit', component: AuditComponent}, {path: 'audit', component: AuditComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'examine', component: ExamineComponent}, {path: 'examine', component: ExamineComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'group', component: GroupComponent}, {path: 'group', component: GroupComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'power', component: PowerComponent}, {path: 'power', component: PowerComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'alarmList', component: AlarmListComponent}, {path: 'alarmList', component: AlarmListComponent,data: { breadcrumb: '告警推送日志' },},
{path: 'alarmLog', component: AlarmLogComponent}, {path: 'alarmLog', component: AlarmLogComponent,data: { breadcrumb: '告警记录' },},
{path: 'alarmManage', component: AlarmManageComponent}, {path: 'alarmManage', component: AlarmManageComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'alarmSet', component: AlarmSetComponent}, {path: 'alarmSet', component: AlarmSetComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'nowAlarm', component: NowAlarmComponent}, {path: 'nowAlarm', component: NowAlarmComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'sendSet', component: SendSetComponent}, {path: 'sendSet', component: SendSetComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'neTopology', component: NeTopologyComponent}, {path: 'neTopology', component: NeTopologyComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'flowTrend', component: FlowTrendComponent}, {path: 'flowTrend', component: FlowTrendComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'topoImg', component: TopologyImgComponent}, {path: 'topoImg', component: TopologyImgComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'workHandle', component: WorkHandleComponent}, {path: 'workHandle', component: WorkHandleComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'inspectPlan', component: InspectPlanComponent}, {path: 'inspectPlan', component: InspectPlanComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'assetPart', component: AssetPartComponent}, {path: 'assetPart', component: AssetPartComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'assetChild', component: ChildAssetsComponent}, {path: 'assetChild', component: ChildAssetsComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'assetsDetail', component: AssetsDetailComponent}, {path: 'assetsDetail', component: AssetsDetailComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'handleDetail', component: HandleDetailComponent}, {path: 'handleDetail', component: HandleDetailComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'handleEvent', component: HandleEventComponent}, {path: 'handleEvent', component: HandleEventComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'resourceUsabil', component: ResourceUsabilComponent,data: { breadcrumb: '资源可用性统计' },}, {path: 'resourceUsabil', component: ResourceUsabilComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'operationWork', component: OperationWorkComponent,data: { breadcrumb: '运维工作' },}, {path: 'operationWork', component: OperationWorkComponent,data: { breadcrumb: '运维工作' },},
{path: 'resourceAlarm', component: ResourceAlarmComponent,data: { breadcrumb: '资源告警统计' },}, {path: 'resourceAlarm', component: ResourceAlarmComponent,data: { breadcrumb: '资源告警统计' },},
......
src/main/webapp/app/home/home.component.html
View file @ aa1c5319
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</div> </div>
</div> </div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="12" class="height-150"> <div nz-col nzSpan="12" class="height-150 releative">
<div class="container-top"> <div class="container-top">
<p>监测点</p> <p>监测点</p>
<p class="round-tag tag-form"> <p class="round-tag tag-form">
...@@ -119,6 +119,11 @@ ...@@ -119,6 +119,11 @@
</div> </div>
</div> </div>
<div nz-col nzSpan="12" class="height-150" echarts [options]="item.option"></div> <div nz-col nzSpan="12" class="height-150" echarts [options]="item.option"></div>
<div class="chart-font">
<p>CPU使用率 {{item.cpu}}%</p>
<p>内存使用率 0%</p>
<p>带宽使用率 {{item.lose}}%</p>
</div>
</div> </div>
</div> </div>
......
src/main/webapp/app/home/home.component.ts
View file @ aa1c5319
...@@ -160,7 +160,7 @@ export class HomeComponent implements OnInit,AfterViewInit { ...@@ -160,7 +160,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
type: 'pie', type: 'pie',
clockWise: false, clockWise: false,
radius: [50, 58], radius: [50, 58],
center:['50%','50%'], center:['30%','50%'],
itemStyle: dataStyle, itemStyle: dataStyle,
hoverAnimation: false, hoverAnimation: false,
startAngle: 90, startAngle: 90,
...@@ -186,7 +186,7 @@ export class HomeComponent implements OnInit,AfterViewInit { ...@@ -186,7 +186,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
type: 'pie', type: 'pie',
clockWise: false, clockWise: false,
radius: [35, 43], radius: [35, 43],
center:['50%','50%'], center:['30%','50%'],
itemStyle: dataStyle, itemStyle: dataStyle,
hoverAnimation: false, hoverAnimation: false,
startAngle: 90, startAngle: 90,
...@@ -195,7 +195,7 @@ export class HomeComponent implements OnInit,AfterViewInit { ...@@ -195,7 +195,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
name: '内存使用率' name: '内存使用率'
}, },
{ {
value: 43.3, value: 0,
name: '', name: '',
tooltip: { tooltip: {
show: false show: false
...@@ -209,7 +209,7 @@ export class HomeComponent implements OnInit,AfterViewInit { ...@@ -209,7 +209,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
type: 'pie', type: 'pie',
clockWise: false, clockWise: false,
radius: [20, 28], radius: [20, 28],
center:['50%','50%'], center:['30%','50%'],
itemStyle: dataStyle, itemStyle: dataStyle,
hoverAnimation: false, hoverAnimation: false,
startAngle: 90, startAngle: 90,
...@@ -533,7 +533,6 @@ export class HomeComponent implements OnInit,AfterViewInit { ...@@ -533,7 +533,6 @@ export class HomeComponent implements OnInit,AfterViewInit {
this.smartSelectGroup.showAddModal("选择资源") this.smartSelectGroup.showAddModal("选择资源")
} }
change(e){ change(e){
this.pageNum = e; this.pageNum = e;
this.getAlarmList(); this.getAlarmList();
......
src/main/webapp/app/home/home.css
View file @ aa1c5319
...@@ -79,13 +79,17 @@ p { ...@@ -79,13 +79,17 @@ p {
.container-top { .container-top {
height: 75px; height: 75px;
padding: 10px; padding: 10px;
border-bottom: 1px solid #dddddd;
border-right: 1px solid #dddddd;
} }
.container-bottom { .container-bottom {
height: 75px; height: 75px;
padding: 10px; padding: 10px;
display: flex; display: flex;
align-items: center align-items: center;
border-bottom: 1px solid #dddddd;
border-right: 1px solid #dddddd;
} }
.margin-0-10{ .margin-0-10{
margin: 0 10px; margin: 0 10px;
...@@ -94,4 +98,10 @@ p { ...@@ -94,4 +98,10 @@ p {
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 15px; right: 15px;
}
.chart-font{
position: absolute;
top: 50%;
right: 5%;
transform: translate(10%,-50%);
} }
\ No newline at end of file
src/main/webapp/app/modal/warn-list/warn-list.component.html
View file @ aa1c5319
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<td>{{data.continuedTime}}</td> <td>{{data.continuedTime}}</td>
<!--<td>{{data.eventid}}</td>--> <!--<td>{{data.eventid}}</td>-->
<td> <td>
<ng-container *ngIf="data.r_clock"><span class="color-red"><i class="anticon anticon-check-square-o"></i></span> </ng-container> <ng-container *ngIf="data.r_clock"><span class="color-green"><i class="anticon anticon-check-square-o"></i></span> </ng-container>
<ng-container *ngIf="!data.r_clock"><span class="color-green"> <i class="anticon anticon-warning"></i></span></ng-container> <ng-container *ngIf="!data.r_clock"><span class="color-red"> <i class="anticon anticon-warning"></i></span></ng-container>
</td> </td>
<td class="list-icon cursor" (click)="showLog(data)"><i class="anticon anticon-profile"></i></td> <td class="list-icon cursor" (click)="showLog(data)"><i class="anticon anticon-profile"></i></td>
</tr> </tr>
......
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