feat: update

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