Commit 8bbea67d authored by wangqinghua's avatar wangqinghua

IE10兼容

parent f225f1e1
import {Routes} from "@angular/router";
import { LoginGuard } from "./shared/common/loginGuard";
import {AppComponent} from "./app.component";
import {JhiLoginModalComponent} from "./shared";
import {JhiMainComponent} from "./layouts";
import {BasicComponent} from "./overAll/basic/basic.component";
import {BasicDetailComponent} from "./overAll/basic/basic-detail/basic-detail.component";
import {AuditComponent} from "./system/audit/audit.component";
import {ExamineComponent} from "./system/examine/examine.component";
import {GroupComponent} from "./system/group/group.component";
import {PowerComponent} from "./system/power/power.component";
import {Routes} from '@angular/router';
import {LoginGuard} from './shared/common/loginGuard';
import {AppComponent} from './app.component';
import {JhiLoginModalComponent} from './shared';
import {JhiMainComponent} from './layouts';
import {BasicComponent} from './overAll/basic/basic.component';
import {BasicDetailComponent} from './overAll/basic/basic-detail/basic-detail.component';
import {AuditComponent} from './system/audit/audit.component';
import {ExamineComponent} from './system/examine/examine.component';
import {GroupComponent} from './system/group/group.component';
import {PowerComponent} from './system/power/power.component';
import {AlarmListComponent} from './alarm/alarm-list/alarm-list.component';
import {AlarmLogComponent} from './alarm/alarm-log/alarm-log.component';
import {AlarmSetComponent} from './alarm/alarm-set/alarm-set.component';
......@@ -47,59 +47,59 @@ import {ServerComponent} from './overAll/modal/server/server.component';
import {SwitchComponent} from './overAll/modal/switch/switch.component';
export const route: Routes = [
{path: '', component: JhiMainComponent,canActivate:[LoginGuard]},
{path: '', redirectTo: 'app/main/home', pathMatch: 'full'},
{
path: 'app', component: AppComponent,
children: [
{path: 'login', component: JhiLoginModalComponent},
{
path: 'main', component: JhiMainComponent,canActivate:[LoginGuard],data: { breadcrumb: '首页' },
path: 'main', component: JhiMainComponent, canActivate: [LoginGuard], data: {breadcrumb: '首页'},
children: [
{path: 'home', component: HomeComponent,data: { breadcrumb: '首页' },},
{path: 'basic', component: BasicComponent,data: { breadcrumb: '基础资源监控' },},
{path: 'basic-detail', component: BasicDetailComponent,data: { breadcrumb: '资源详情' },},
{path: 'networkCheck', component: NetworkCheckComponent,data: { breadcrumb: '网站监测' },},
{path: 'network-detail', component: NetworkDetailComponent,data: { breadcrumb: '网站监测详情' },},
{path: 'audit', component: AuditComponent,data: { breadcrumb: '系统审计' },},
{path: 'examine', component: ExamineComponent,data: { breadcrumb: '系统审核' },},
{path: 'group', component: GroupComponent,data: { breadcrumb: '组织用户' },},
{path: 'power', component: PowerComponent,data: { breadcrumb: '角色与权限' },},
{path: 'alarmList', component: AlarmListComponent,data: { breadcrumb: '告警记录' },},
{path: 'alarmLog', component: AlarmLogComponent,data: { breadcrumb: '告警推送日志' },},
{path: 'alarmSet', component: AlarmSetComponent,data: { breadcrumb: '告警推送设置' },},
{path: 'nowAlarm', component: NowAlarmComponent,data: { breadcrumb: '当前告警' },},
{path: 'sendSet', component: SendSetComponent,data: { breadcrumb: '发送方式设置' },},
{path: 'neTopology', component: NeTopologyComponent,data: { breadcrumb: '网络拓扑图' },},
{path: 'flowTrend', component: FlowTrendComponent,data: { breadcrumb: '流量趋势' },},
{path: 'topoImg', component: TopologyImgComponent,data: { breadcrumb: '拓扑图标管理' },},
{path: 'workHandle', component: WorkHandleComponent,data: { breadcrumb: '运维事件' },},
{path: 'inspectPlan', component: InspectPlanComponent,data: { breadcrumb: '巡检计划' },},
{path: 'assetPart', component: AssetPartComponent,data: { breadcrumb: '资产备件' },},
{path: 'assetChild', component: ChildAssetsComponent,data: { breadcrumb: '资产子分类' },},
{path: 'assetsDetail', component: AssetsDetailComponent,data: { breadcrumb: '资产详情' },},
{path: 'handleDetail', component: HandleDetailComponent,data: { breadcrumb: '事件详情' },},
{path: 'handleEvent', component: HandleEventComponent,data: { breadcrumb: '处理事件' },},
{path: 'resourceUsabil', component: ResourceUsabilComponent,data: { breadcrumb: '资源可用性统计' },},
{path: 'operationWork', component: OperationWorkComponent,data: { breadcrumb: '运维工作' },},
{path: 'resourceAlarm', component: ResourceAlarmComponent,data: { breadcrumb: '资源告警统计' },},
{path: 'params', component: PararmsComponent,data: { breadcrumb: '参数配置' },},
{path: 'template', component: TemplateComponent,data: { breadcrumb: '模版配置' },},
{path: 'discoveryList', component: DiscoveryListComponent,data: { breadcrumb: '自动发现列表' },},
{path: 'checkList', component: CheckListComponent,data: { breadcrumb: '监控项原型' },},
{path: 'triggerList', component: TriggerListComponent,data: { breadcrumb: '阈值原型' },},
{path: 'itemList', component: ItemListComponent,data: { breadcrumb: '监控项' },},
{path: 'triList', component: TriListComponent,data: { breadcrumb: '阈值' },},
{path: 'bOverview', component: BOverviewComponent,data: { breadcrumb: '业务概览' },},
{path: 'bTopology', component: BTopologyComponent,data: { breadcrumb: '业务拓扑' },},
{path: 'effectAnalysis', component: EffectAnalysisComponent,data: { breadcrumb: '效能分析' },},
{path: 'logAnalysis', component: LogAnalysisComponent,data: { breadcrumb: '日志分析' },},
{path: 'bConfig', component: BConfigComponent,data: { breadcrumb: '业务配置' },},
{path: 'database', component: DatabaseComponent,data: { breadcrumb: '数据库' },},
{path: 'server', component: ServerComponent,data: { breadcrumb: '服务器' },},
{path: 'switch', component: SwitchComponent,data: { breadcrumb: '交换机' },},
{path: 'home', component: HomeComponent, data: {breadcrumb: '首页'},},
{path: 'basic', component: BasicComponent, data: {breadcrumb: '基础资源监控'},},
{path: 'basic-detail', component: BasicDetailComponent, data: {breadcrumb: '资源详情'},},
{path: 'networkCheck', component: NetworkCheckComponent, data: {breadcrumb: '网站监测'},},
{path: 'network-detail', component: NetworkDetailComponent, data: {breadcrumb: '网站监测详情'},},
{path: 'audit', component: AuditComponent, data: {breadcrumb: '系统审计'},},
{path: 'examine', component: ExamineComponent, data: {breadcrumb: '系统审核'},},
{path: 'group', component: GroupComponent, data: {breadcrumb: '组织用户'},},
{path: 'power', component: PowerComponent, data: {breadcrumb: '角色与权限'},},
{path: 'alarmList', component: AlarmListComponent, data: {breadcrumb: '告警记录'},},
{path: 'alarmLog', component: AlarmLogComponent, data: {breadcrumb: '告警推送日志'},},
{path: 'alarmSet', component: AlarmSetComponent, data: {breadcrumb: '告警推送设置'},},
{path: 'nowAlarm', component: NowAlarmComponent, data: {breadcrumb: '当前告警'},},
{path: 'sendSet', component: SendSetComponent, data: {breadcrumb: '发送方式设置'},},
{path: 'neTopology', component: NeTopologyComponent, data: {breadcrumb: '网络拓扑图'},},
{path: 'flowTrend', component: FlowTrendComponent, data: {breadcrumb: '流量趋势'},},
{path: 'topoImg', component: TopologyImgComponent, data: {breadcrumb: '拓扑图标管理'},},
{path: 'workHandle', component: WorkHandleComponent, data: {breadcrumb: '运维事件'},},
{path: 'inspectPlan', component: InspectPlanComponent, data: {breadcrumb: '巡检计划'},},
{path: 'assetPart', component: AssetPartComponent, data: {breadcrumb: '资产备件'},},
{path: 'assetChild', component: ChildAssetsComponent, data: {breadcrumb: '资产子分类'},},
{path: 'assetsDetail', component: AssetsDetailComponent, data: {breadcrumb: '资产详情'},},
{path: 'handleDetail', component: HandleDetailComponent, data: {breadcrumb: '事件详情'},},
{path: 'handleEvent', component: HandleEventComponent, data: {breadcrumb: '处理事件'},},
{path: 'resourceUsabil', component: ResourceUsabilComponent, data: {breadcrumb: '资源可用性统计'},},
{path: 'operationWork', component: OperationWorkComponent, data: {breadcrumb: '运维工作'},},
{path: 'resourceAlarm', component: ResourceAlarmComponent, data: {breadcrumb: '资源告警统计'},},
{path: 'params', component: PararmsComponent, data: {breadcrumb: '参数配置'},},
{path: 'template', component: TemplateComponent, data: {breadcrumb: '模版配置'},},
{path: 'discoveryList', component: DiscoveryListComponent, data: {breadcrumb: '自动发现列表'},},
{path: 'checkList', component: CheckListComponent, data: {breadcrumb: '监控项原型'},},
{path: 'triggerList', component: TriggerListComponent, data: {breadcrumb: '阈值原型'},},
{path: 'itemList', component: ItemListComponent, data: {breadcrumb: '监控项'},},
{path: 'triList', component: TriListComponent, data: {breadcrumb: '阈值'},},
{path: 'bOverview', component: BOverviewComponent, data: {breadcrumb: '业务概览'},},
{path: 'bTopology', component: BTopologyComponent, data: {breadcrumb: '业务拓扑'},},
{path: 'effectAnalysis', component: EffectAnalysisComponent, data: {breadcrumb: '效能分析'},},
{path: 'logAnalysis', component: LogAnalysisComponent, data: {breadcrumb: '日志分析'},},
{path: 'bConfig', component: BConfigComponent, data: {breadcrumb: '业务配置'},},
{path: 'database', component: DatabaseComponent, data: {breadcrumb: '数据库'},},
{path: 'server', component: ServerComponent, data: {breadcrumb: '服务器'},},
{path: 'switch', component: SwitchComponent, data: {breadcrumb: '交换机'},},
]
},
]
},
{path: '*', component: AppComponent,canActivate:[LoginGuard]},
{path: '*', component: AppComponent, canActivate: [LoginGuard]},
];
......@@ -104,6 +104,9 @@
</ng-container>
</div>
</nz-col>
</nz-row>
<nz-row [nzGutter]="10">
<nz-col class="padding-10" nzSpan="12">
<div class="host-item-title">运行情况统计</div>
<div class="host-item-table" style="height: 500px">
......@@ -138,6 +141,8 @@
<div echarts [options]="rightTwoChart" style="height: 250px;width: 100%"></div>
</div>
</nz-col>
</nz-row>
<nz-row [nzGutter]="10">
<nz-col class="padding-10" nzSpan="12">
<div class="host-item-title">接口流量排行</div>
<div class="host-item-table" style="height: 500px">
......@@ -174,6 +179,8 @@
</ng-container>
</div>
</nz-col>
</nz-row>
<nz-row [nzGutter]="10">
<nz-col class="padding-10" nzSpan="16">
<div class="host-item-title">网络拓扑图</div>
<div class="time-group" style="top: 18px;">
......
......@@ -3,7 +3,7 @@
<nz-sider [nzWidth]="200">
<jhi-sidebar></jhi-sidebar>
</nz-sider>
<nz-layout>
<nz-layout class="layout-content">
<jhi-navbar></jhi-navbar>
<nz-content>
<div class="container" #container>
......
......@@ -12,7 +12,17 @@ import {Subscription} from 'rxjs';
@Component({
selector: 'jhi-main',
templateUrl: './main.component.html',
styles:[`
styles:[`
.layout{
display: -ms-flexbox;
-ms-flex-direction:row;
background-color: #193250;
}
.layout-content{
display: -ms-flexbox;
-ms-flex-direction: column;
-ms-flex: auto;
}
`]
})
export class JhiMainComponent implements OnInit {
......
<div class="logo">智能运维监管平台</div>
<div class="logo">
<div class="text-center margin-bottom-10">
<img style="height: 35px;" src="../../../content/images/logo_gaocun.png" alt="高淳监狱智能运维管理系统">
</div>
高淳监狱智能运维管理系统
</div>
<ul nz-menu [nzMode]="'inline'">
<ng-container *ngFor="let item of menuList">
<li nz-submenu (nzOpenChange)="openHandler(item)" [(nzOpen)]="item.checked">
......
<div class="background">
<div class="login-center">
<div class="login-logo">
<img src="../../../content/images/logo.png" alt="无锡智能运维监管平台">
<!-- <img src="../../../content/images/logo.png" alt="无锡智能运维监管平台">-->
高淳监狱智能运维管理系统
</div>
<form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
<nz-form-item>
......
......@@ -16,7 +16,7 @@
.logo{
color: #ffffff;
text-align: center;
font-size: 20px;
font-size: 15px;
font-weight: 500;
padding: 17px 0;
}
......
......@@ -298,7 +298,13 @@ ui bootstrap tweaks
transform: translate(-50%,-50%);
}
.login-logo{
text-align: center;
text-align: center;
font-size: 40px;
color: rgb(189,192,198);
background-image:-webkit-linear-gradient(bottom,#d3e3fe,#ffffff);
-webkit-background-clip: text; /*必需加前缀 -webkit- 才支持这个text值 */
-webkit-text-fill-color: transparent; /*text-fill-color会覆盖color所定义的字体颜色: */
/*text-shadow:2px 2px 10px #333333;*/
}
.login-logo img{
width: 300px;
......
......@@ -4,7 +4,7 @@
<base href="./"/>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>智能运维监管平台</title>
<title>高淳监狱智能运维管理系统</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#000000">
......@@ -15,6 +15,7 @@
<script src="javascript/jtopo/js/jtopo-0.4.8-dev.js" type="text/javascript"></script>
<script src="javascript/jtopo/js/jtopo-editor.js" type="text/javascript"></script>
</head>
<body>
<style>
html, body {
width: 100%;
......@@ -62,7 +63,6 @@
}
</style>
<body>
<!--[if lt IE 9]>
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
your browser</a> to improve your experience.</p>
......
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