Commit b9373d78 authored by wangqinghua's avatar wangqinghua

update

parent 8afb13d2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<span (click)="showBasicEditModal()">添加资源</span> <span (click)="showBasicEditModal()">添加资源</span>
</span> </span>
</span> </span>
<a class="main-color margin-left-10" (click)="goOut()">首页</a> <a class="main-color margin-left-10" (click)="goOut()">机房监控系统</a>
</div> </div>
<div nz-col [nzSpan]="12" style="text-align: right"> <div nz-col [nzSpan]="12" style="text-align: right">
<nz-select style="width: 150px;margin-right: 20px" [(ngModel)]="theme" (ngModelChange)="changeTheme()"> <nz-select style="width: 150px;margin-right: 20px" [(ngModel)]="theme" (ngModelChange)="changeTheme()">
......
...@@ -4,6 +4,7 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; ...@@ -4,6 +4,7 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { ProfileService } from '../profiles/profile.service'; import { ProfileService } from '../profiles/profile.service';
import { Principal, LoginService } from '../../shared'; import { Principal, LoginService } from '../../shared';
import {timer} from 'rxjs/observable/timer';
import {ThemeList, VERSION} from '../../app.constants'; import {ThemeList, VERSION} from '../../app.constants';
import {LocalStorageService} from 'ngx-webstorage'; import {LocalStorageService} from 'ngx-webstorage';
...@@ -139,6 +140,12 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{ ...@@ -139,6 +140,12 @@ export class NavbarComponent implements OnInit ,AfterViewChecked{
} }
goOut(){ goOut(){
window.location.href = "http://26.81.99.220/control/user/userlogin.php?userid=sa&userpwd=123456";
timer(10).subscribe(
()=>{
window.location.href = "http://26.81.0.15/#/app/main/home";
window.open('https://cloud.cesgroup.com.cn:8888/oa/index',"_blank");
}
)
} }
} }
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<ng-container *ngIf="editType == '只读模式'"> <ng-container *ngIf="editType == '只读模式'">
<nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor" <nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor"
(ngModelChange)="changeColor()"> (ngModelChange)="changeColor()">
<nz-option nzLabel="深蓝" nzValue="#3d76ab"></nz-option> <nz-option nzLabel="深蓝" nzValue="#132c4c"></nz-option>
<nz-option nzLabel="白色" nzValue="#ffffff"></nz-option> <nz-option nzLabel="白色" nzValue="#ffffff"></nz-option>
<nz-option nzLabel="淡绿" nzValue="#cadf91"></nz-option> <nz-option nzLabel="淡绿" nzValue="#cadf91"></nz-option>
<nz-option nzLabel="棕色" nzValue="#cbb492"></nz-option> <nz-option nzLabel="棕色" nzValue="#cbb492"></nz-option>
......
$dark: #193250; $dark: #193250;
$fontColor: #b7d1f1; $fontColor: #b2d4f9;
.dark { .dark {
//UI框架 //UI框架
...@@ -16,6 +16,11 @@ $fontColor: #b7d1f1; ...@@ -16,6 +16,11 @@ $fontColor: #b7d1f1;
background-color: #234163; background-color: #234163;
} }
.ant-table-thead > tr.ant-table-row-hover > td, .ant-table-tbody > tr.ant-table-row-hover > td, .ant-table-thead > tr:hover > td, .ant-table-tbody > tr:hover > td {
background: #30547a;
}
.gray-font-color { .gray-font-color {
color: $fontColor; color: $fontColor;
} }
...@@ -24,6 +29,10 @@ $fontColor: #b7d1f1; ...@@ -24,6 +29,10 @@ $fontColor: #b7d1f1;
color: #7bcefb; color: #7bcefb;
} }
.main-color {
color: $fontColor;
}
.container { .container {
height: 100%; height: 100%;
padding: 0 16px; padding: 0 16px;
...@@ -80,9 +89,10 @@ $fontColor: #b7d1f1; ...@@ -80,9 +89,10 @@ $fontColor: #b7d1f1;
//自己写的 //自己写的
//主机详情 //主机详情
.layout{ .layout {
background-color: #193250; background-color: #193250;
} }
.host-item-title { .host-item-title {
background-color: $dark; background-color: $dark;
color: #f2f2f2; color: #f2f2f2;
...@@ -128,7 +138,7 @@ $fontColor: #b7d1f1; ...@@ -128,7 +138,7 @@ $fontColor: #b7d1f1;
height: 400px; height: 400px;
nz-col { nz-col {
padding:6px 10px; padding: 6px 10px;
word-break: break-all; word-break: break-all;
} }
...@@ -189,6 +199,6 @@ $fontColor: #b7d1f1; ...@@ -189,6 +199,6 @@ $fontColor: #b7d1f1;
} }
.topology-context { .topology-context {
background: rgb(61, 118, 171); background: #132c4c;
} }
} }
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