Commit 4dc8a5ef authored by liuzheng712's avatar liuzheng712

feat: update

parent ff74f4f3
...@@ -170,6 +170,12 @@ server.run = function (options) { ...@@ -170,6 +170,12 @@ server.run = function (options) {
}] }]
}]) }])
}); });
apis.route('/replay')
.get(function (req, res) {
res.json({
"type": "json"
})
});
apis.route('/perms/v1/user/my/asset-groups-assets/') apis.route('/perms/v1/user/my/asset-groups-assets/')
.get(function (req, res) { .get(function (req, res) {
res.json([ res.json([
......
...@@ -43,13 +43,3 @@ ...@@ -43,13 +43,3 @@
.hidden { .hidden {
display: none; display: none;
} }
#liuzheng {
position: fixed;
top: 0;
left: 0;
z-index: -1;
font-size: 11px !important;
padding-bottom: 16px !important;
font-family: 'Monaco', iosevka !important;
}
...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
[ngClass]="{'disconnected':!m.connected,'hidden': m.hide || m.type!='ssh'}" id="term-{{i}}"> [ngClass]="{'disconnected':!m.connected,'hidden': m.hide || m.type!='ssh'}" id="term-{{i}}">
</div> </div>
</div> </div>
<span id="liuzheng">liuzheng</span>
...@@ -13,13 +13,15 @@ import {IndexPageComponent} from './IndexPage/index-page.component'; ...@@ -13,13 +13,15 @@ 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 {RdppageComponent} from './rdppage/rdppage.component';
import {TermpageComponent} from "./termpage/termpage.component"; import {TermpageComponent} from './termpage/termpage.component';
import {ReplayPageComponent} from './replay-page/replay-page.component';
const appRoutes: Routes = [ const appRoutes: Routes = [
{path: 'users/login', component: LoginComponent}, {path: 'users/login', component: LoginComponent},
{path: 'rdp/:token', component: RdppageComponent}, {path: 'rdp/:token', component: RdppageComponent},
{path: 'term/:token', component: TermpageComponent}, {path: 'term/:token', component: TermpageComponent},
{path: 'replay/:token', component: ReplayPageComponent},
{path: '', component: ControlPageComponent}, {path: '', component: ControlPageComponent},
{path: '**', component: NotFoundComponent} {path: '**', component: NotFoundComponent}
]; ];
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<i class="fa fa-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>
</button> </button>
<button type="button" class="btn" (click)="play()"> <button type="button" class="btn" (click)="play()">
<i class="fa" aria-hidden="true" [ngClass]="{'fa-play':playing,'fa-pause': !playing}"></i> <i class="fa" aria-hidden="true" [ngClass]="{'fa-play':!playing,'fa-pause': playing}"></i>
</button> </button>
<button type="button" class="btn"> <button type="button" class="btn">
<i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-forward" aria-hidden="true"></i>
...@@ -22,3 +22,5 @@ ...@@ -22,3 +22,5 @@
<button type="button" class="btn"> <button type="button" class="btn">
<i class="fa fa-compress" aria-hidden="true"></i> <i class="fa fa-compress" aria-hidden="true"></i>
</button> </button>
<app-mp4 *ngIf="video.type=='mp4'"></app-mp4>
<app-json *ngIf="video.type=='json'"></app-json>
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {ActivatedRoute, Params} from '@angular/router';
import {Logger} from 'angular2-logger/core';
import {HttpService} from '../app.service';
@Component({ @Component({
selector: 'app-replay-page', selector: 'app-replay-page',
...@@ -6,10 +9,34 @@ import { Component, OnInit } from '@angular/core'; ...@@ -6,10 +9,34 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./replay-page.component.css'] styleUrls: ['./replay-page.component.css']
}) })
export class ReplayPageComponent implements OnInit { export class ReplayPageComponent implements OnInit {
playing: boolean;
video: any;
constructor() { } constructor(private activatedRoute: ActivatedRoute,
private _http: HttpService,
private _logger: Logger) {
}
ngOnInit() { ngOnInit() {
let token: string;
this.activatedRoute.params.subscribe((params: Params) => {
token = params['token'];
});
this._http.get('/api/replay?' + token)
.map(res => res.json())
.subscribe(
data => {
this.video = data;
},
err => {
this._logger.error(err);
},
);
}
play() {
this.playing = !this.playing;
} }
} }
...@@ -21,17 +21,3 @@ ...@@ -21,17 +21,3 @@
#term .terminal div span { #term .terminal div span {
min-width: 12px; min-width: 12px;
} }
#liuzheng {
position: fixed;
top: 0;
left: 0;
z-index: -1;
font-size: 11px !important;
padding-bottom: 16px !important;
font-family: 'Monaco', iosevka !important;
}
button{
width: 40px;
}
<span id="liuzheng">liuzheng</span>
<div id="term"></div> <div id="term"></div>
...@@ -12,7 +12,6 @@ declare let Terminal: any; ...@@ -12,7 +12,6 @@ declare let Terminal: any;
styleUrls: ['./termpage.component.css'] styleUrls: ['./termpage.component.css']
}) })
export class TermpageComponent implements OnInit { export class TermpageComponent implements OnInit {
playing: boolean;
constructor(private activatedRoute: ActivatedRoute) { constructor(private activatedRoute: ActivatedRoute) {
DataStore.NavShow = false; DataStore.NavShow = false;
...@@ -56,8 +55,4 @@ export class TermpageComponent implements OnInit { ...@@ -56,8 +55,4 @@ export class TermpageComponent implements OnInit {
} }
play() {
this.playing = !this.playing;
}
} }
...@@ -10,5 +10,7 @@ ...@@ -10,5 +10,7 @@
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
<span id="liuzheng">liuzheng</span>
</body> </body>
</html> </html>
...@@ -20,3 +20,14 @@ body { ...@@ -20,3 +20,14 @@ body {
app-root { app-root {
height: 100%; height: 100%;
} }
#liuzheng {
position: fixed;
top: 0;
left: 0;
z-index: -1;
font-size: 11px !important;
padding-bottom: 16px !important;
font-family: 'Monaco', iosevka !important;
}
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