From 414d150327c692a115aa06414d8bf17509388943 Mon Sep 17 00:00:00 2001 From: wangyuerg Date: Fri, 5 Mar 2021 20:37:03 +0800 Subject: feat:modify style Signed-off-by: wangyuerg Change-Id: I3f6784469382e3fddeb6e27f756086d5f25f2d85 Issue-ID: USECASEUI-527 --- .../src/app/mock/json/slicing_business_list.json | 39 ++++++++++++++++++++-- .../mock/json/slicing_business_list_activated.json | 1 + .../views/services/slicing-management/constant.ts | 2 +- .../business-order/business-order.component.less | 6 ++-- .../slicing-business-model.component.ts | 17 ---------- .../slicing-business-table.component.html | 3 +- 6 files changed, 42 insertions(+), 26 deletions(-) (limited to 'usecaseui-portal/src/app') diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json index 224f8035..d0402c13 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json +++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json @@ -13,7 +13,18 @@ "service_snssai": "1-010101", "orchestration_status": "processing", "last_operation_type": "processing", - "last_operation_progress": 80 + "last_operation_progress": 80, + "anVersion":"10.2.3.4.5", + "vLanText":"111", + "tnVersion":"10.0.1.1.1", + "tnText":"TN EDGEText", + "mbps":"111", + "msText":"111", + "linkType":"p2p/mp2p", + "tnEndVersion":"10.1.1.1", + "tnEndText":"TN EDGEText", + "cnVlan":"11", + "cnVersion":"1.1.2.3" }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9267", @@ -22,7 +33,18 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activated", - "last_operation_progress": 10 + "last_operation_progress": 10, + "anVersion":"10.2.3.4.5", + "vLanText":"222", + "tnVersion":"10.0.1.1.1", + "tnText":"TN EDGEText", + "mbps":"222", + "msText":"222", + "linkType":"p2p/mp2p", + "tnEndVersion":"10.1.1.1", + "tnEndText":"TN EDGEText", + "cnVlan":"22", + "cnVersion":"1.1.2.3" }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9271", @@ -31,7 +53,18 @@ "service_snssai": "1-010101", "orchestration_status": "deactivated", "last_operation_type": "deactivated", - "last_operation_progress": 100 + "last_operation_progress": 100, + "anVersion":"10.2.3.4.5", + "vLanText":"333", + "tnVersion":"10.0.1.1.1", + "tnText":"TN EDGEText", + "mbps":"333", + "msText":"333", + "linkType":"p2p/mp2p", + "tnEndVersion":"10.1.1.1", + "tnEndText":"TN EDGEText", + "cnVlan":"33", + "cnVersion":"1.1.2.3" } ] } diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json index de4d608b..ecbdf535 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json +++ b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json @@ -14,6 +14,7 @@ "orchestration_status": "activated", "last_operation_type": "activate", "last_operation_progress": 10 + } ] } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/constant.ts b/usecaseui-portal/src/app/views/services/slicing-management/constant.ts index 2cdf6cbe..4a0e4d4f 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/constant.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/constant.ts @@ -1,3 +1,3 @@ // The polling interval of this module is set here uniformly // communication service, sclcing resouce management--slicing business management, -export const INTERVAL_TIME = 5000; +export const INTERVAL_TIME = 100000; diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less index 4feac5d7..63c50def 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less @@ -32,15 +32,15 @@ } .detail-wrap{ - width: 300px; - height: 450px; + width: 380px; + height: 400px; background: rgba(0, 0, 0, .8); line-height: 20px; border-radius: 4px; text-indent: 2em; position: absolute; right: -200px; - top: -430px; + top: -410px; color:#ffffff; p{ padding: 10px 10px 0 10px; diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts index 0bffccf5..8ce9a39f 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts @@ -26,22 +26,6 @@ export class SlicingBusinessModelComponent implements OnInit { isSpinning: boolean = true; status: string = ""; ngOnInit() { - console.log(this.businessId, "id",this.outerData); - const param = { - anVersion:'10.2.3.4.5', - vLanText:'111', - tnVersion:'10.0.1.1.1', - tnText:'TN EDGEText', - mbps:'333', - msText:'555', - linkType:'p2p/mp2p', - tnEndVersion:'10.1.1.1', - tnEndText:'TN EDGEText', - cnVlan:'66', - cnVersion:'1.1.2.3' - } - this.outerData = {...this.outerData,...param} - console.log('new',this.outerData) this.status = this.outerData.orchestration_status this.getDetail() } @@ -68,7 +52,6 @@ export class SlicingBusinessModelComponent implements OnInit { }) } showdetail(data) { - console.log(data, "data.nsi_id"); const nsiModal = this.modalService.create({ nzTitle: "Detail", nzContent: NsiModelComponent, diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html index bcd024ec..79ac67b3 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html @@ -61,9 +61,8 @@ - View + [ngClass]="{'cannotclick':data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100'}" >View Detail -- cgit 1.2.3-korg