diff --git a/src/app/pages/terminals/terminals.component.html b/src/app/pages/terminals/terminals.component.html index 1415c0f..6661aa2 100644 --- a/src/app/pages/terminals/terminals.component.html +++ b/src/app/pages/terminals/terminals.component.html @@ -106,7 +106,10 @@ Обновлено: - + + Нет Данных + + {{terminal?.socket_data?.last_ping | date:'dd.MM.yy, HH:mm:ss'}} @@ -114,7 +117,10 @@ Закрыто: - + + Нет Данных + + {{terminal?.socket_data?.closed ? 'Да' : 'Нет'}} diff --git a/src/app/pages/terminals/terminals.component.ts b/src/app/pages/terminals/terminals.component.ts index c453f67..971391d 100644 --- a/src/app/pages/terminals/terminals.component.ts +++ b/src/app/pages/terminals/terminals.component.ts @@ -99,8 +99,8 @@ export class TerminalsComponent implements OnInit { async getTerminal(id: string) { await this.jsonRpcService.rpc({ method: 'getTerminal', - params: [ this.choose, id] - }, RpcService.authService, false) + params: [this.choose, id] + }, RpcService.authService, true) .subscribe({ next: (result) => { let data = result.result; diff --git a/src/app/services/jsonrpc.service.ts b/src/app/services/jsonrpc.service.ts index b572333..1859618 100644 --- a/src/app/services/jsonrpc.service.ts +++ b/src/app/services/jsonrpc.service.ts @@ -40,11 +40,12 @@ export class JsonrpcService { private cookiesService: CookiesService ) { } - rpc(data: {method: string, params: any},service: RpcService, auth = false): Observable { + rpc(data: {method: string, params: any}, service: RpcService, auth?: boolean): Observable { let headers = new HttpHeaders(); const token = decodeURI(this.cookiesService.getItem('token') ?? ''); + console.log(token); headers = headers.set('Content-Type', 'application/json'); - auth ? headers.set('Authorization', token) : null; + auth ? headers = headers.append('Authorization', token) : null; const options = { headers: headers, };