summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2019-08-16 01:54:59 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-16 01:54:59 +0000
commite86d393096599044ba5a6a42ad386c9990d61501 (patch)
tree81bd4b9e44be90c0cd2aa94717586081c22c7908 /usecaseui-portal/src/app
parent7bf9e819890a3bbf5d36ba6d5f36e93afa55588d (diff)
parentbed34b02106cb0cbfc1584a134384c098c6acfbf (diff)
Merge "date based comments removed"
Diffstat (limited to 'usecaseui-portal/src/app')
-rw-r--r--usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css43
-rw-r--r--usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css15
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html205
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less6
-rw-r--r--usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html28
-rw-r--r--usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less7
-rw-r--r--usecaseui-portal/src/app/homes.service.ts4
-rw-r--r--usecaseui-portal/src/app/services/services-list/services-list.component.html6
-rw-r--r--usecaseui-portal/src/app/services/services-list/services-list.component.less29
9 files changed, 142 insertions, 201 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css
index 23ea9d7a..81b727c8 100644
--- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css
+++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css
@@ -25,14 +25,13 @@ hr {
margin-bottom: 10px;
}
.model {
- background-color: #F7F8FC;
- /*height: 100%;*/
+ background-color: #F7F8FC;
overflow-y: auto;
}
.creation-model{
position: relative;
}
-.top-title{ /*2019.01.22 add*/
+.top-title{
width: 100%;
padding: 20px;
position: relative;
@@ -49,8 +48,7 @@ hr {
background-size: 100%!important;
border-radius:4px;
color: #D7D7D7;
- cursor: pointer;
- /*border: 1px solid #ffffff;*/
+ cursor: pointer;
}
.model .back:hover{
background: url("../../assets/images/Return-icon-active.png")!important;
@@ -63,8 +61,7 @@ hr {
font-family:ArialMT;
color:#3C4F8C;
line-height:35px;
- display: inline-block;
- /*top:10px;*/
+ display: inline-block;
}
.model .submit{
@@ -75,20 +72,17 @@ hr {
right: 85px;
color: #fff;
font-size: 18px;
- background:#0DA9E2;
- /*background:linear-gradient(90deg,rgba(99,194,246,1) 0%,rgba(62,155,255,1) 100%) !important;*/
+ background:#0DA9E2;
border-radius:4px;
border: none!important;
border-color:rgba(0,0,0,0)!important;
}
.model .submit:hover{
- background:#09C6E2;
- /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/
+ background:#09C6E2;
border: none;
}
.model .creation {
- width: 100%;
- /*height: 60vh;*/
+ width: 100%;
overflow-y: auto;
border-radius: 5px;
padding: 15px;
@@ -138,9 +132,7 @@ hr {
left: 50px;
top: 60px;
background-color: #fff;
- /*box-shadow: 0px 0px 20px #000;*/
- width:1500px;
- /*width:1300px;px*/
+ width:1500px;
height: 81%;
border-radius:2px;
overflow:auto;
@@ -158,11 +150,8 @@ hr {
line-height: 35px;
font-size: 18px;
font-weight: 500;
- margin: 10px auto;
- /*padding-left: 10px;*/
- color: #06A7E2;
- /*color: #ffffff;*/
- /*background:linear-gradient(90deg,rgba(7,169,225,1) 0%,rgba(48,217,196,1) 100%);*/
+ margin: 10px auto;
+ color: #06A7E2;
border-bottom: 2px solid;
border-image: -webkit-linear-gradient(#07A9E1,#30D9C4) 100 100;
border-image: -moz-linear-gradient(#07A9E1,#30D9C4) 100 100;
@@ -221,13 +210,11 @@ hr {
font-size: 16px;
margin: 0 15px;
}
-.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){
- /*background:linear-gradient(310deg,rgba(30,158,255,1) 0%,rgba(99,200,255,1) 100%);*/
+.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){
background: #0DA9E2;
color: #fff;
}
-.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{
- /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/
+.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{
background:#09C6E2;
}
@@ -279,15 +266,13 @@ hr {
/* chart */
.model .chart {
width: 98%;
- padding: 10px;
- /*height: 30vh;*/
+ padding: 10px;
margin: 0 auto;
color: #06A7E2;
font-size: 16px;
font-weight: 500;
margin-bottom: 30px;
- background: #EEF9FF;
- /*background:linear-gradient(180deg,rgba(183, 230, 247, 1) 0%,rgba(214, 240, 254, 1) 100%);*/
+ background: #EEF9FF;
border-radius:4px;
}
.model .chart #createChart {
diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css
index 704b2eb2..d489dd8b 100644
--- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css
+++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css
@@ -26,14 +26,13 @@ hr {
}
.model {
background-color: #F7F8FC;
- /*height: 100%;*/
overflow-y: auto;
}
.creation-model{
position: relative;
height: 100%;
}
-.top-title{ /*2019.02.22 add*/
+.top-title{
width: 100%;
padding: 20px;
position: relative;
@@ -64,7 +63,6 @@ hr {
border-radius:4px;
color: #D7D7D7;
cursor: pointer;
- /*border: 1px solid #ffffff;*/
}
.model .back:hover{
background: url("../../assets/images/Return-icon-active.png")!important;
@@ -175,9 +173,7 @@ hr {
left: 50px;
top: 60px;
background-color: #fff;
- /*box-shadow: 0px 0px 20px #000;*/
width:1500px;
- /*width:1300px;px*/
height: 81%;
border-radius:2px;
overflow:auto;
@@ -196,10 +192,7 @@ hr {
font-size: 18px;
font-weight: 500;
margin: 10px auto;
- /*padding-left: 10px;*/
color: #06A7E2;
- /*color: #ffffff;*/
- /*background:linear-gradient(90deg,rgba(7,169,225,1) 0%,rgba(48,217,196,1) 100%);*/
border-bottom: 2px solid;
border-image: -webkit-linear-gradient(#07A9E1,#30D9C4) 100 100;
border-image: -moz-linear-gradient(#07A9E1,#30D9C4) 100 100;
@@ -258,13 +251,11 @@ hr {
font-size: 16px;
margin: 0 15px;
}
-.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){
- /*background:linear-gradient(310deg,rgba(30,158,255,1) 0%,rgba(99,200,255,1) 100%);*/
+.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){
background: #0DA9E2;
color: #fff;
}
-.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{
- /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/
+.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{
background:#09C6E2;
}
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);
}
diff --git a/usecaseui-portal/src/app/homes.service.ts b/usecaseui-portal/src/app/homes.service.ts
index 04b1199c..b9b9d5bf 100644
--- a/usecaseui-portal/src/app/homes.service.ts
+++ b/usecaseui-portal/src/app/homes.service.ts
@@ -120,11 +120,11 @@ export class HomesService {
return this.http.get<any>(httpurl);
}
- //2019.1.2 add listSortMasters
+
getListSortMasters(){
return this.http.get<any>(this.url.listSortMasters);
}
- //2019.05.08 add
+
getCurrentLanguage(currentloginId){
let url=this.url.currentLanguage+currentloginId;
return this.http.get<any>(url);
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html
index 969898a3..1370f4bf 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.html
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html
@@ -246,7 +246,7 @@
</nz-select>
</div>
</div>
- <!--2019.05.09 add Scale notification-->
+
<ng-template #templatescalestarting >
<div class="ant-notification-notice-content">
<div class="ant-notification-notice-with-icon">
@@ -309,7 +309,7 @@
[(ngModel)]="gracefulTerminationTimeout">
</div>
</div>
- <!--2019.05.09 add delete notification-->
+
<ng-template #templatedeletestarting >
<div class="ant-notification-notice-content">
<div class="ant-notification-notice-with-icon">
@@ -408,7 +408,7 @@
</nz-select>
</div>
</div>
- <!--2019.05.09 add heal notification-->
+
<ng-template #templatehealstarting >
<div class="ant-notification-notice-content">
<div class="ant-notification-notice-with-icon">
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.less b/usecaseui-portal/src/app/services/services-list/services-list.component.less
index 7f23ac8b..fcb70b82 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.less
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.less
@@ -130,7 +130,6 @@ hr {
}
.create:hover{
background:#09C6E2;
- //background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;
}
}
@@ -146,17 +145,14 @@ hr {
float: left;
background:url("../../../assets/images/servicelist-e2e.png") no-repeat;
background-size: 100% 100%;
- //background:linear-gradient(90deg,rgba(16,174,222,1) 0%,rgba(43,206,202,1) 100%);
border-radius:2px;
}
.top-num .top-list:nth-child(2){
background:url("../../../assets/images/servicelist-e2e.png") no-repeat;
- //background:url("../../../assets/images/servicelist-ns.png") no-repeat;
background-size: 100% 100%;
}
.top-num .top-list:nth-child(3){
background:url("../../../assets/images/servicelist-e2e.png") no-repeat;
- //background:url("../../../assets/images/servicelist-sotn.png") no-repeat;
background-size: 100% 100%;
}
.top-num .top-list:nth-child(4){
@@ -333,7 +329,6 @@ hr {
height: 100vh;
background-color: #f3f3f3;
overflow-y: auto;
- //padding: 20px 32px;
z-index: 3;
}
.createComponent {
@@ -344,39 +339,19 @@ hr {
height: 100vh;
background-color: #F7F8FC;
overflow-y: auto;
- //padding: 20px 32px;
z-index: 3;
}
-/*2019.01.14*/
+
.e2eColor,.nsColor,.ccvpnColor,.sotnColor,.voLTEColor{
- //color: #3671AB;
width:120px;
height: 34px;
line-height: 34px;
margin-bottom: 0!important;
text-align: center;
background:rgba(158, 158, 158, 0.38);
- //background:linear-gradient(131deg,rgba(147,196,255,1) 0%,rgba(120,241,226,1) 100%);
border-radius:4px
}
-//.nsColor{
-// background:linear-gradient(135deg,rgba(253,187,127,1) 0%,rgba(250,215,153,1) 100%);
-// border-radius:4px;
-// color: #A16C39;
-//}
-//.ccvpnColor{
-// background:linear-gradient(135deg,rgba(198,222,251,1) 0%,rgba(217,215,252,1) 100%);
-// border-radius:4px;
-// color: #7C74BB;
-//}
-//.sotnColor{
-// background:rgba(201,243,239,1);
-// border-radius:4px;
-// color: #30B0A0;
-//}
-//.voLTEColor{
-// background:rgba(201,243,239,1);
-//}
+
.vnfColor,.siteColor,.SDWANColor{
color:rgba(60,79,140,0.5);
width:120px;