feat: update

parent c82388ab
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
[index]="i" [index]="i"
*ngIf="m.type=='ssh'"> *ngIf="m.type=='ssh'">
</app-element-term> </app-element-term>
<app-element-guacamole [host]="m.host" <app-element-iframe [host]="m.host"
[userid]="m.user.id" [userid]="m.user.id"
[index]="i" [index]="i"
*ngIf="m.type=='rdp'"> *ngIf="m.type=='rdp'">
</app-element-guacamole> </app-element-iframe>
</div> </div>
...@@ -27,7 +27,7 @@ import {LoginComponent} from './BasicPage/login/login.component'; ...@@ -27,7 +27,7 @@ import {LoginComponent} from './BasicPage/login/login.component';
import {ElementPopupComponent} from './elements/popup/popup.component'; import {ElementPopupComponent} from './elements/popup/popup.component';
import {ElementRdpComponent} from './elements/rdp/rdp.component'; import {ElementRdpComponent} from './elements/rdp/rdp.component';
import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component'; import {ElementServerMenuComponent} from './elements/server-menu/server-menu.component';
import {ElementGuacamoleComponent} from './elements/guacamole/guacamole.component'; import {ElementIframeComponent} from './elements/iframe/iframe.component';
// pages // pages
import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component'; import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component';
import {SearchComponent, SearchFilter} from './ControlPage/search/search.component'; import {SearchComponent, SearchFilter} from './ControlPage/search/search.component';
...@@ -63,7 +63,7 @@ import {WindowsComponent} from './monitor-page/windows/windows.component'; ...@@ -63,7 +63,7 @@ import {WindowsComponent} from './monitor-page/windows/windows.component';
ElementInteractiveComponent, ElementInteractiveComponent,
ElementRdpComponent, ElementRdpComponent,
ElementServerMenuComponent, ElementServerMenuComponent,
ElementGuacamoleComponent, ElementIframeComponent,
LoginComponent, LoginComponent,
SearchComponent, SearchComponent,
SearchFilter, SearchFilter,
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementGuacamoleComponent } from './guacamole.component'; import { ElementIframeComponent } from './iframe.component';
describe('ElementGuacamoleComponent', () => { describe('ElementIframeComponent', () => {
let component: ElementGuacamoleComponent; let component: ElementIframeComponent;
let fixture: ComponentFixture<ElementGuacamoleComponent>; let fixture: ComponentFixture<ElementIframeComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ElementGuacamoleComponent ] declarations: [ ElementIframeComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(ElementGuacamoleComponent); fixture = TestBed.createComponent(ElementIframeComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
...@@ -3,11 +3,11 @@ import {DomSanitizer} from '@angular/platform-browser'; ...@@ -3,11 +3,11 @@ import {DomSanitizer} from '@angular/platform-browser';
import {NavList} from '../../ControlPage/control/control.component'; import {NavList} from '../../ControlPage/control/control.component';
@Component({ @Component({
selector: 'app-element-guacamole', selector: 'app-element-iframe',
templateUrl: './guacamole.component.html', templateUrl: './iframe.component.html',
styleUrls: ['./guacamole.component.scss'] styleUrls: ['./iframe.component.scss']
}) })
export class ElementGuacamoleComponent implements OnInit { export class ElementIframeComponent implements OnInit {
@Input() host: any; @Input() host: any;
@Input() userid: any; @Input() userid: any;
@Input() index: number; @Input() index: number;
...@@ -17,8 +17,7 @@ export class ElementGuacamoleComponent implements OnInit { ...@@ -17,8 +17,7 @@ export class ElementGuacamoleComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
// this.target = '/guacamole/?asset_id=' + '&system_user_id=' + ''; this.target = 'https://wx.qq.com/';
this.target = 'https://www.baidu.com';
} }
trust(url) { trust(url) {
......
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