diff options
Diffstat (limited to 'usecaseui-portal/src/app/components')
4 files changed, 118 insertions, 128 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 5e9f8158..da673bf0 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 @@ -15,132 +15,125 @@ --> <!--<h3 class="title"> Services List </h3>--> <div class="model creation-model"> - <!-- Create data --> + <!-- Create data --> <div class="top-title"> - <h3 class="title fl">{{createParams.commonParams.templateType}} {{"i18nTextDefine_InstanceCreation" | translate}} </h3> + <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="submit" nz-button (click)="submit()"> + <span> {{"i18nTextDefine_Create" | translate}} </span> + </button> <button class="back" nz-button (click)="goback()"></button> </div> </div> <div class="e2ecreate-content"> - <div class="creation fl"> - <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix"> - <!--2019.02.21 add--> - <div class="vnf-box"> + <div class="creation fl"> + <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix"> + <div class="vnf-box"> <h3> {{"i18nTextDefine_Base" | translate}} </h3> - <ul class="clearfix"> - <li><span>Name:</span> <input nz-input [(ngModel)]="service.name"></li> - <li><span>Description:</span> <input nz-input [(ngModel)]="service.description"></li> - <li><span>COS:</span> <input nz-input [(ngModel)]="service.COS"></li> - <li><span>EBS:</span> <input nz-input [(ngModel)]="service.EBS"></li> - </ul> - </div> - <div class="vnf-box" *ngIf="templateParameters.inputs.length>0"> + <ul class="clearfix"> + <li> + <span>Name:</span> + <input nz-input [(ngModel)]="service.name"> + </li> + <li> + <span>Description:</span> + <input nz-input [(ngModel)]="service.description"> + </li> + <li> + <span>COS:</span> + <input nz-input [(ngModel)]="service.COS"> + </li> + <li> + <span>EBS:</span> + <input nz-input [(ngModel)]="service.EBS"> + </li> + </ul> + </div> + <div class="vnf-box" *ngIf="templateParameters.inputs.length>0"> <h3>{{"i18nTextDefine_templateInputs" | translate}}</h3> - <ul> - <li *ngFor="let parameter of templateParameters.inputs; let i = index;"> - <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" title="{{parameter.name}}">{{parameter.name}}:</span> - <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input - [(ngModel)]="parameter.value"> - - <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: - {{parameter.name}}</h5> - <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span> - <nz-select *ngIf="parameter.type === 'vf_location'" - [(ngModel)]="parameter.value" nzAllowClear> - <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> - </nz-select> - <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear > - <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option> - </nz-select> --> - </li> - </ul> - </div> - <div class="vnf-box" *ngFor="let template of templateParameters.nestedTemplates;"> - <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> - <input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input - [(ngModel)]="input.value"> + <ul> + <li *ngFor="let parameter of templateParameters.inputs; let i = index;"> + <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" title="{{parameter.name}}">{{parameter.name}}:</span> + <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input [(ngModel)]="parameter.value"> - <h5 *ngIf="input.type === 'vf_location'" style="padding-left:10px;">id: {{input.name}}</h5> - <span *ngIf="input.type === 'vf_location'"> vf_location: </span> - <nz-select *ngIf="input.type === 'vf_location'" - [(ngModel)]="input.value" - nzAllowClear> - <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" - [nzLabel]="vim.name"></nz-option> - </nz-select> + <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: {{parameter.name}} + </h5> + <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span> + <nz-select *ngIf="parameter.type === 'vf_location'" [(ngModel)]="parameter.value" nzAllowClear> + <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> + </nz-select> + </li> + </ul> + </div> + <div class="vnf-box" *ngFor="let template of templateParameters.nestedTemplates;"> + <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> + <input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input [(ngModel)]="input.value"> - <!--<nz-select *ngIf="input.type === 'sdn_controller'" style="width: 165px;"--> - <!--[(ngModel)]="input.value" nzAllowClear>--> - <!--<nz-option *ngFor="let control of sdnControllers" [nzValue]="control"--> - <!--[nzLabel]="control.name"></nz-option>--> - <!--</nz-select>--> - </li> - </ul> + <h5 *ngIf="input.type === 'vf_location'" style="padding-left:10px;">id: {{input.name}}</h5> + <span *ngIf="input.type === 'vf_location'"> vf_location: </span> + <nz-select *ngIf="input.type === 'vf_location'" [(ngModel)]="input.value" nzAllowClear> + <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> + </nz-select> + </li> + </ul> + </div> </div> - </div> - <div *ngIf="createParams.commonParams.templateType=='Network Service'" class="baseparms clearfix"> - <div class="vnf-box"> + <div *ngIf="createParams.commonParams.templateType=='Network Service'" class="baseparms clearfix"> + <div class="vnf-box"> <h3> {{"i18nTextDefine_Base" | translate}} </h3> - <ul class="clearfix"> - <li><span>Name:</span> <input nz-input [(ngModel)]="ns_service.nsName"></li> - <li><span>Description:</span> <input nz-input [(ngModel)]="ns_service.description"></li> - </ul> - </div> - <div class="vnf-box" *ngIf="nsTemplateParameters.inputs2.length>0"> + <ul class="clearfix"> + <li> + <span>Name:</span> + <input nz-input [(ngModel)]="ns_service.nsName"> + </li> + <li> + <span>Description:</span> + <input nz-input [(ngModel)]="ns_service.description"> + </li> + </ul> + </div> + <div class="vnf-box" *ngIf="nsTemplateParameters.inputs2.length>0"> <h4>{{"i18nTextDefine_templateInputs" | translate}}</h4> - <ul> - <li *ngFor="let parameter of nsTemplateParameters.inputs2; let i = index;"> - <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" title="{{parameter.name}}">{{parameter.name}}:</span> - <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input - [(ngModel)]="parameter.value"> + <ul> + <li *ngFor="let parameter of nsTemplateParameters.inputs2; let i = index;"> + <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" title="{{parameter.name}}">{{parameter.name}}:</span> + <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input [(ngModel)]="parameter.value"> - <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: - {{parameter.name}}</h5> - <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span> - <nz-select *ngIf="parameter.type === 'vf_location'" - [(ngModel)]="parameter.value" nzAllowClear> - <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> - </nz-select> - <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear > - <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option> - </nz-select> --> - </li> - </ul> - </div> - <div class="vnf-box"> + <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: {{parameter.name}} + </h5> + <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span> + <nz-select *ngIf="parameter.type === 'vf_location'" [(ngModel)]="parameter.value" nzAllowClear> + <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> + </nz-select> + </li> + </ul> + </div> + <div class="vnf-box"> <h4 *ngIf="nsTemplateParameters.vnfs.length>0">vnfs Inputs</h4> - <ul> - <li *ngFor="let vnf of nsTemplateParameters.vnfs;"> - <h5 style="padding-left:10px;">id: {{vnf.vnf_id}}</h5> - <span> vf_location: </span> - <nz-select [(ngModel)]="vnf.value" nzAllowClear> - <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> - </nz-select> - </li> - </ul> + <ul> + <li *ngFor="let vnf of nsTemplateParameters.vnfs;"> + <h5 style="padding-left:10px;">id: {{vnf.vnf_id}}</h5> + <span> vf_location: </span> + <nz-select [(ngModel)]="vnf.value" nzAllowClear> + <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option> + </nz-select> + </li> + </ul> + </div> </div> </div> - </div> <div class="dividing-line fl"></div> - <!-- chart --> - <div class="chart fr"> - <div id="createChart"> - <svg width="100%" height="100%"> - - <!--<image xlink:href="./assets/images/create-e2e.png"--> - <!--x="40%" y="16%" />--> - - </svg> - + <!-- chart --> + <div class="chart fr"> + <div id="createChart"> + <svg width="100%" height="100%"> + </svg> </div> </div> </div> -</div> - +</div>
\ No newline at end of file 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 22c12fb7..35b91799 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 @@ -29,7 +29,7 @@ hr { height: 100%; overflow-y: auto; position: relative; - .top-title{ /*2019.01.22 add*/ + .top-title{ width: 100%; padding: 20px; position: relative; @@ -64,7 +64,6 @@ hr { border-radius:4px; color: #D7D7D7; cursor: pointer; - /*border: 1px solid #ffffff;*/ } .back:hover{ background: url("../../../assets/images/Return-icon-active.png")!important; @@ -78,8 +77,6 @@ hr { color:#3C4F8C; line-height:35px; display: inline-block; - /*top:10px;*/ - } .e2ecreate-content{ position: relative; @@ -134,7 +131,6 @@ hr { font: 700 14px "Arial"; vertical-align: middle; overflow: hidden; - //text-overflow: ellipsis; text-align: left; } input,nz-select{ 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 29ac4194..c0953a90 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 @@ -24,12 +24,17 @@ </div> <div class="detaildata fl"> <div *ngIf="detailParams.serviceDomain == 'E2E Service'" class="baseparms clearfix"> - <!--2019.02.21 add--> <div class="vnf-box"> <h3> {{"i18nTextDefine_Base" | translate}} </h3> <ul class="clearfix"> - <li><span style="width:15%">Name:</span> <span class="input-content">{{service.name}}</span></li> - <li><span style="width:25%">Description:</span><span class="input-content">{{service.description}}</span></li> + <li> + <span style="width:15%">Name:</span> + <span class="input-content">{{service.name}}</span> + </li> + <li> + <span style="width:25%">Description:</span> + <span class="input-content">{{service.description}}</span> + </li> </ul> </div> <div class="vnf-box" *ngIf="getKeys(e2e_requestInputs).length>0"> @@ -56,8 +61,14 @@ <div class="vnf-box"> <h3> {{"i18nTextDefine_Base" | translate}} </h3> <ul class="clearfix"> - <li><span style="width:15%">Name:</span> <span class="input-content">{{ns_service.name}}</span></li> - <li><span style="width:25%">Description:</span><span class="input-content">{{ns_service.description}}</span></li> + <li> + <span style="width:15%">Name:</span> + <span class="input-content">{{ns_service.name}}</span> + </li> + <li> + <span style="width:25%">Description:</span> + <span class="input-content">{{ns_service.description}}</span> + </li> </ul> </div> <div class="vnf-box" *ngIf="getKeys(ns_requestInputs).length>0"> @@ -86,13 +97,8 @@ <div class="chart fr"> <div id="createChart"> <svg width="100%" height="100%"> - - <!--<image xlink:href="./assets/images/create-e2e.png"--> - <!--x="40%" y="16%" />--> - </svg> - </div> </div> -</div> +</div>
\ No newline at end of file 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 bba5160f..3f03af34 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 @@ -32,7 +32,7 @@ hr { height: 100%; overflow-y: auto; position: relative; - .top-title{ /*2019.01.22 add*/ + .top-title{ width: 100%; padding: 20px; position: relative; @@ -50,7 +50,6 @@ hr { border-radius:4px; color: #D7D7D7; cursor: pointer; - /*border: 1px solid #ffffff;*/ } .back:hover{ background: url("../../../assets/images/Return-icon-active.png")!important; @@ -64,8 +63,6 @@ hr { color:#3C4F8C; line-height:35px; display: inline-block; - /*top:10px;*/ - } .detaildata{ position: relative; @@ -103,7 +100,6 @@ hr { margin-left: 30px; } ul li { - // display: inline-block; margin: 10px 0; width: 49%; float: left; @@ -116,7 +112,6 @@ hr { font: 700 14px "Arial"; vertical-align: middle; overflow: hidden; - //text-overflow: ellipsis; text-align: left; color:rgba(60,79,140,0.5); } |