Merge branch 'org' into dev

src/app/app.service.ts

@@ -126,9 +126,9 @@ export class HttpService {
     return this.http.get('/api/terminal/v1/sessions/' + token + '/replay');
   }
 
-  get_replay_json(token: string) {
-    return this.http.get('/api/terminal/v2/sessions/' + token + '/replay');
-  }
+  // get_replay_json(token: string) {
+  //   return this.http.get('/api/terminal/v2/sessions/' + token + '/replay');
+  // }
 
   get_replay_data(src: string) {
     return this.http.get(src);

src/app/elements/asset-tree/asset-tree.component.ts

@@ -70,7 +70,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     }
     if (changes['query'] && !changes['query'].firstChange) {
       this.searchEvt$.next(this.query);
-      // this.filter();
     }
   }
 
@@ -129,7 +128,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
   }
 
   Connect(host) {
-    // console.log(host);
     let user: any;
     if (host.system_users_granted.length > 1) {
       user = this.checkPriority(host.system_users_granted);

src/app/pages/replay/replay.component.ts

@@ -24,7 +24,7 @@ export class PagesReplayComponent implements OnInit {
       .subscribe(params => {
         token = params['token'];
       });
-    this._http.get_replay_json(token)
+    this._http.get_replay(token)
       .subscribe(
         data => {
           this.replay.type = data['type'];
@@ -32,7 +32,6 @@ export class PagesReplayComponent implements OnInit {
           this.replay.id = data['id'];
         },
         err => {
-          this._http.get_replay(token);
           alert('没找到录像文件');
         }
       );