diff options
Diffstat (limited to 'usecaseui-portal/src/app/components')
5 files changed, 22 insertions, 27 deletions
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html index b2ec4401..5e9f8158 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html @@ -20,9 +20,7 @@ <h3 class="title fl">{{createParams.commonParams.templateType}} {{"i18nTextDefine_InstanceCreation" | translate}} </h3> <div class="fl" style="width: 20%"> <button class="submit" nz-button (click)="submit()"><span> {{"i18nTextDefine_Create" | translate}} </span></button> - <button class="back" nz-button (click)="goback()"> - <i class="anticon anticon-arrow-left" style="transform: scale(1.5)"></i> - </button> + <button class="back" nz-button (click)="goback()"></button> </div> </div> <div class="e2ecreate-content"> @@ -63,7 +61,7 @@ <h3>{{template.name}}</h3> <ul> <li *ngFor="let input of template.inputs; let i = index;"> - <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" title=" {{input.name}}"> {{input.name}}: </span> + <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" title="{{input.name}}"> {{input.name}}: </span> <input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input [(ngModel)]="input.value"> diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less index 1900f7d2..22c12fb7 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less @@ -52,21 +52,23 @@ hr { background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important; border: none; } - .back { + .back,.back:hover{ position: absolute; top: 10px; right: 20px; display: inline-block; width: 35px; height: 35px; - background:#ffffff!important; + background:url("../../../assets/images/Return-icon.png") no-repeat!important; + background-size: 100%!important; border-radius:4px; color: #D7D7D7; + cursor: pointer; + /*border: 1px solid #ffffff;*/ } .back:hover{ - background:#ffffff; - color: #3F9CFF; - border:1px solid #3F9CFF; + background: url("../../../assets/images/Return-icon-active.png")!important; + background-size: 100%!important; } .top-title h3.title { height: 35px; diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts index d5e1a3a0..dc8566e0 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts @@ -27,7 +27,7 @@ export class E2eCreationComponent implements OnInit { constructor( private myhttp:MyhttpService ) { } ngOnInit() { - this.getTemParameters(); + this.gete2eTemParameters(this.e2e_ns_temParametersContent); this.getVimInfo(); this.getSdnControllers(); console.log(this.createParams); @@ -36,6 +36,7 @@ export class E2eCreationComponent implements OnInit { @Output() e2eCloseCreate = new EventEmitter(); @Output() nsCloseCreate = new EventEmitter(); @Input() createParams; + @Input() e2e_ns_temParametersContent; // e2e serviceTemplateParameters @@ -75,12 +76,10 @@ export class E2eCreationComponent implements OnInit { '2': './assets/images/create-ns.png', '3': './assets/images/create-vnf.png', }; - getTemParameters(){ //Get template parameters + gete2eTemParameters(data) { //Get template parameters let type = this.createParams.commonParams.templateType == "E2E Service" ? "e2e" : "ns"; - this.myhttp.getTemplateParameters(type,this.createParams.template) - .subscribe((data)=>{ - // console.log(this.createParams); - // console.log(data); + console.log(this.createParams); + console.log(data); if(type == "e2e"){ this.templateParameters = data; this.templateParameters.nestedTemplates.forEach((item)=>{ @@ -124,7 +123,6 @@ export class E2eCreationComponent implements OnInit { this.drawImage(type) - }) } vimInfos=[]; getVimInfo() { diff --git a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html index dec6f2d3..29ac4194 100644 --- a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html +++ b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html @@ -19,9 +19,7 @@ <div class="top-title"> <h3 class="title fl">{{serviceInstanceName}} Instance Detail</h3> <div class="fl" style="width: 20%"> - <button class="back" nz-button (click)="goback()"> - <i class="anticon anticon-arrow-left" style="transform: scale(1.5)"></i> - </button> + <button class="back" nz-button (click)="goback()"></button> </div> </div> <div class="detaildata fl"> diff --git a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less index fd306c5b..bba5160f 100644 --- a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less +++ b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less @@ -38,21 +38,23 @@ hr { position: relative; display: inline-block; } - .back { + .back,.back:hover{ position: absolute; top: 10px; right: 20px; display: inline-block; width: 35px; height: 35px; - background:#ffffff!important; + background:url("../../../assets/images/Return-icon.png") no-repeat!important; + background-size: 100%!important; border-radius:4px; color: #D7D7D7; + cursor: pointer; + /*border: 1px solid #ffffff;*/ } .back:hover{ - background:#ffffff; - color: #3F9CFF; - border:1px solid #3F9CFF; + background: url("../../../assets/images/Return-icon-active.png")!important; + background-size: 100%!important; } .top-title h3.title { height: 35px; @@ -132,10 +134,7 @@ hr { height: 95%; box-shadow: 0px 10px 35px 10px rgba(222, 222, 222, 0.5); margin-right: 40px; - //background: url("../../../assets/images/ccvpn-createbanner2.png") no-repeat -45px -10px; - //background-size: 110% 110%; background:linear-gradient(180deg,rgba(183, 230, 247, 1) 0%,rgba(214, 240, 254, 1) 100%); - //background-color: rgba(188, 231, 248, 1); border-radius: 4px; #createChart{ height: 100%; |