From 1a15520467f3bdb83817c6e27bc9e933a5a9ccfe Mon Sep 17 00:00:00 2001 From: cyuamber Date: Mon, 24 Feb 2020 13:41:21 +0800 Subject: feat:HTML formatting code to optimize the comments in the test Change-Id: I8abcc7b579279b6c45614d72d46e03195e25b51c Issue-ID: USECASEUI-368 Signed-off-by: cyuamber --- usecaseui-portal/package-lock.json | 17 ++-- .../services-list/top-card/top-card.component.less | 2 +- .../business-order/business-order.component.html | 33 +++---- .../business-order/business-order.component.ts | 24 ++--- ...csmf-slicing-business-management.component.html | 100 ++++++++++----------- ...csmf-slicing-business-management.component.less | 19 ++-- usecaseui-portal/src/constants/constants.ts | 2 +- 7 files changed, 92 insertions(+), 105 deletions(-) (limited to 'usecaseui-portal') diff --git a/usecaseui-portal/package-lock.json b/usecaseui-portal/package-lock.json index b311f2be..c6e4543f 100644 --- a/usecaseui-portal/package-lock.json +++ b/usecaseui-portal/package-lock.json @@ -3906,8 +3906,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -3928,14 +3927,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3955,8 +3952,7 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", @@ -4104,7 +4100,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4112,8 +4107,7 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", @@ -4224,8 +4218,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", diff --git a/usecaseui-portal/src/app/views/services/services-list/top-card/top-card.component.less b/usecaseui-portal/src/app/views/services/services-list/top-card/top-card.component.less index a235b1e6..0d95773f 100644 --- a/usecaseui-portal/src/app/views/services/services-list/top-card/top-card.component.less +++ b/usecaseui-portal/src/app/views/services/services-list/top-card/top-card.component.less @@ -3,7 +3,7 @@ width:100%; max-width:400px; height:170px; - background:url("/assets/images/servicelist-e2e.png") no-repeat; + background:url("../../../../../assets/images/servicelist-e2e.png") no-repeat; background-size: 100% 100%; border-radius:2px; .round{ diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html index e4a5ef19..3b6debb9 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html @@ -1,7 +1,6 @@ - +
@@ -9,28 +8,18 @@ {{ item.title }} - - - + + + (blur)="validator(item,slicing_order_info[item.key],i)" + (focus)="changeTooltipText(item.title)"/> @@ -52,8 +41,7 @@
+ class="subnet_params_area" *ngFor="let item of area; let ind = index"> @@ -63,8 +51,7 @@
+ [nzPageSizeOptions]="[5,10,15,20]" [nzTotal]='total' [(nzPageSize)]="pageSize" [(nzPageIndex)]='pageIndex' + [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData(true)"> - - No - Service Instance Id - Service Instance Name - Created Time - - S-NSSAI - Status - Activate - Terminate - + + No + Service Instance Id + Service Instance Name + Created Time + + S-NSSAI + Status + Activate + Terminate + - - - {{i+1}} - {{ data.order_id }} - {{ data.order_name }} - {{ data.order_creation_time }} - - {{ data.service_snssai }} - - - {{data.order_status}} - -
- - -
- - - -
- + + + {{i+1}} + {{ data.order_id }} + {{ data.order_name }} + {{ data.order_creation_time }} + + {{ data.service_snssai }} -
- - - -
+ + {{data.order_status}} + +
- -
+ +
+ + + +
+ + +
+ + + +
+ + +
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less index f52f4ad2..f66d3ad4 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less @@ -1,31 +1,38 @@ nz-select { width: 200px; } -.task_status{ + +.task_status { margin-bottom: 20px; - span{ + + span { margin-right: 5%; } } -.action-icon{ + +.action-icon { display: inline-block; vertical-align: top; } + i.anticon { cursor: pointer; font-size: 18px; padding: 2px 15px; - vertical-align: inherit!important; - &:hover{ + vertical-align: inherit !important; + + &:hover { color: #147dc2; } } + .cannotclick { pointer-events: none; color: #aaa; opacity: 0.6; } -.buy-button{ + +.buy-button { float: right; margin-right: 2%; } \ No newline at end of file diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 17e6aa33..57def7b1 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -248,7 +248,7 @@ export const BUSINESS_STATUS = [ export const COMMUNICATION_FORM_ITEMS = [ { - title: 'Slicing Business Name', + title: 'Communication Service Name', key: 'name' }, { -- cgit 1.2.3-korg