Commit e2183f2d authored by ibuler's avatar ibuler

Merge branch 'org' into dev

parents b99ef6d1 b009b0a8
...@@ -126,9 +126,9 @@ export class HttpService { ...@@ -126,9 +126,9 @@ export class HttpService {
return this.http.get('/api/terminal/v1/sessions/' + token + '/replay'); return this.http.get('/api/terminal/v1/sessions/' + token + '/replay');
} }
get_replay_json(token: string) { // get_replay_json(token: string) {
return this.http.get('/api/terminal/v2/sessions/' + token + '/replay'); // return this.http.get('/api/terminal/v2/sessions/' + token + '/replay');
} // }
get_replay_data(src: string) { get_replay_data(src: string) {
return this.http.get(src); return this.http.get(src);
......
...@@ -70,7 +70,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -70,7 +70,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
} }
if (changes['query'] && !changes['query'].firstChange) { if (changes['query'] && !changes['query'].firstChange) {
this.searchEvt$.next(this.query); this.searchEvt$.next(this.query);
// this.filter();
} }
} }
...@@ -129,7 +128,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -129,7 +128,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
} }
Connect(host) { Connect(host) {
// console.log(host);
let user: any; let user: any;
if (host.system_users_granted.length > 1) { if (host.system_users_granted.length > 1) {
user = this.checkPriority(host.system_users_granted); user = this.checkPriority(host.system_users_granted);
......
...@@ -24,7 +24,7 @@ export class PagesReplayComponent implements OnInit { ...@@ -24,7 +24,7 @@ export class PagesReplayComponent implements OnInit {
.subscribe(params => { .subscribe(params => {
token = params['token']; token = params['token'];
}); });
this._http.get_replay_json(token) this._http.get_replay(token)
.subscribe( .subscribe(
data => { data => {
this.replay.type = data['type']; this.replay.type = data['type'];
...@@ -32,7 +32,6 @@ export class PagesReplayComponent implements OnInit { ...@@ -32,7 +32,6 @@ export class PagesReplayComponent implements OnInit {
this.replay.id = data['id']; this.replay.id = data['id'];
}, },
err => { err => {
this._http.get_replay(token);
alert('没找到录像文件'); alert('没找到录像文件');
} }
); );
......
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