Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
e2183f2d
Commit
e2183f2d
authored
Aug 06, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'org' into dev
parents
b99ef6d1
b009b0a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
app.service.ts
src/app/app.service.ts
+3
-3
asset-tree.component.ts
src/app/elements/asset-tree/asset-tree.component.ts
+0
-2
replay.component.ts
src/app/pages/replay/replay.component.ts
+1
-2
No files found.
src/app/app.service.ts
View file @
e2183f2d
...
@@ -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
);
...
...
src/app/elements/asset-tree/asset-tree.component.ts
View file @
e2183f2d
...
@@ -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
);
...
...
src/app/pages/replay/replay.component.ts
View file @
e2183f2d
...
@@ -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
(
'没找到录像文件'
);
}
}
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment