Commit c81513c0 authored by liuzheng712's avatar liuzheng712

feat: do some fix

parent 021d0153
...@@ -2,6 +2,5 @@ ...@@ -2,6 +2,5 @@
<div *ngFor="let m of NavList.List;let i=index" <div *ngFor="let m of NavList.List;let i=index"
[ngClass]="{'disconnected':!m.connected,'hidden': m.hide,'hidden':m.type!='rdp'}" id="rdp-{{i}}"> [ngClass]="{'disconnected':!m.connected,'hidden': m.hide,'hidden':m.type!='rdp'}" id="rdp-{{i}}">
<canvas id="canvas-{{i}}"></canvas> <canvas id="canvas-{{i}}"></canvas>
</div> </div>
</div> </div>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
#term > div { #term > div {
height:100%; height: 100%;
} }
.terminal { .terminal {
......
...@@ -13,12 +13,16 @@ import {IndexPageComponent} from './IndexPage/index-page.component'; ...@@ -13,12 +13,16 @@ import {IndexPageComponent} from './IndexPage/index-page.component';
import {NotFoundComponent} from './BasicPage/not-found/not-found.component'; import {NotFoundComponent} from './BasicPage/not-found/not-found.component';
import {LoginComponent} from './BasicPage/login/login.component'; import {LoginComponent} from './BasicPage/login/login.component';
import {ControlPageComponent} from './ControlPage/controlpage.component'; import {ControlPageComponent} from './ControlPage/controlpage.component';
import {RdppageComponent} from "./rdppage/rdppage.component";
import {TermpageComponent} from "./termpage/termpage.component";
const appRoutes: Routes = [ const appRoutes: Routes = [
// { path: 'crisis-center', component: CrisisListComponent }, // { path: 'crisis-center', component: CrisisListComponent },
// {path: 'welcome', component: IndexPageComponent}, // <-- delete this line // {path: 'welcome', component: IndexPageComponent}, // <-- delete this line
{path: 'login', component: LoginComponent}, {path: 'login', component: LoginComponent},
{path: 'control', component: ControlPageComponent}, {path: 'control', component: ControlPageComponent},
{path: 'rdp/:token', component: RdppageComponent},
{path: 'term/:token', component: TermpageComponent},
{path: '', redirectTo: '/control', pathMatch: 'full'}, {path: '', redirectTo: '/control', pathMatch: 'full'},
{path: '**', component: NotFoundComponent} {path: '**', component: NotFoundComponent}
]; ];
......
<app-nav></app-nav> <app-nav *ngIf="DataStore.NavShow"></app-nav>
<nav></nav> <nav *ngIf="DataStore.NavShow"></nav>
<router-outlet></router-outlet> <router-outlet></router-outlet>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @author liuzheng <liuzheng712@gmail.com> * @author liuzheng <liuzheng712@gmail.com>
*/ */
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {AppService, HttpService} from './app.service'; import {AppService, HttpService, DataStore} from './app.service';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
...@@ -17,5 +17,5 @@ import {AppService, HttpService} from './app.service'; ...@@ -17,5 +17,5 @@ import {AppService, HttpService} from './app.service';
}) })
export class AppComponent { export class AppComponent {
// DataStore = DataStore; DataStore = DataStore;
} }
...@@ -34,6 +34,8 @@ import {ControlPageComponent} from './ControlPage/controlpage.component'; ...@@ -34,6 +34,8 @@ import {ControlPageComponent} from './ControlPage/controlpage.component';
import {IndexPageComponent} from './IndexPage/index-page.component'; import {IndexPageComponent} from './IndexPage/index-page.component';
import {NotFoundComponent} from './BasicPage/not-found/not-found.component'; import {NotFoundComponent} from './BasicPage/not-found/not-found.component';
import {PopupComponent} from './BasicPage/popup/popup.component'; import {PopupComponent} from './BasicPage/popup/popup.component';
import { RdppageComponent } from './rdppage/rdppage.component';
import { TermpageComponent } from './termpage/termpage.component';
@NgModule({ @NgModule({
...@@ -60,7 +62,9 @@ import {PopupComponent} from './BasicPage/popup/popup.component'; ...@@ -60,7 +62,9 @@ import {PopupComponent} from './BasicPage/popup/popup.component';
ControlPageComponent, ControlPageComponent,
IndexPageComponent, IndexPageComponent,
NotFoundComponent, NotFoundComponent,
PopupComponent PopupComponent,
RdppageComponent,
TermpageComponent,
// HeroListComponent, // HeroListComponent,
// CrisisListComponent, // CrisisListComponent,
], ],
......
...@@ -57,6 +57,7 @@ export let User: { ...@@ -57,6 +57,7 @@ export let User: {
export let DataStore: { export let DataStore: {
socket: any; socket: any;
Nav: Array<{}>; Nav: Array<{}>;
NavShow: boolean;
Path: {}; Path: {};
error: {}; error: {};
msg: {}; msg: {};
...@@ -66,6 +67,7 @@ export let DataStore: { ...@@ -66,6 +67,7 @@ export let DataStore: {
} = { } = {
socket: io.connect(), socket: io.connect(),
Nav: [{}], Nav: [{}],
NavShow: true,
Path: {}, Path: {},
error: {}, error: {},
msg: {}, msg: {},
......
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