diff options
5 files changed, 13 insertions, 10 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts index a88d1618..48c8d5ac 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts @@ -20,7 +20,7 @@ export class NsiTableComponent implements OnInit { listOfData: any[] = []; pageIndex: number = 1; pageSize: number = 10; - total: number = 100; + total: number = 0; loading = false; isSelect: boolean = false; statusOptions: any[] = BUSINESS_STATUS; @@ -37,9 +37,9 @@ export class NsiTableComponent implements OnInit { this.isSelect = true; } this.myhttp.getSlicingNsiList(paramsObj,this.isSelect).subscribe (res => { - const { result_header: { result_code }, result_body: { nsi_service_instances } } = res; + const { result_header: { result_code }, result_body: { nsi_service_instances,record_number } } = res; if (+result_code === 200) { - this.total = nsi_service_instances.length; + this.total = record_number; this.loading = false; this.listOfData = nsi_service_instances; } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html index c2408a81..82e02b24 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.html @@ -27,7 +27,7 @@ <th>Service Instance Id</th> <th>Service Instance Name</th> <th>Service Type</th> - <th>Context</th> + <th>Environment Context</th> <th>Status</th> <th width="140px">Detail</th> </tr> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts index 926350b9..00e5c5c9 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts @@ -20,7 +20,7 @@ export class NssiTableComponent implements OnInit { listOfData: any[] = []; pageIndex: number = 1; pageSize: number = 10; - total: number = 100; + total: number = 0; loading = false; isSelect: boolean = false; statusOptions: any[] = BUSINESS_STATUS; @@ -37,9 +37,9 @@ export class NssiTableComponent implements OnInit { this.isSelect = true; } this.myhttp.getSlicingNssiList(paramsObj,this.isSelect).subscribe (res => { - const { result_header: { result_code }, result_body: { nssi_service_instances } } = res; + const { result_header: { result_code }, result_body: { nssi_service_instances,record_number } } = res; if (+result_code === 200) { - this.total = nssi_service_instances.length; + this.total = record_number; this.loading = false; this.listOfData = nssi_service_instances; } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts index ffcb2fe0..0d4c6df8 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts @@ -26,7 +26,7 @@ export class SlicingBusinessTableComponent implements OnInit { listOfData: any[] = []; pageIndex: number = 1; pageSize: number = 10; - total: number = 100; + total: number = 0; loading = false; isSelect: boolean = false; statusOptions: any[] = BUSINESS_STATUS; @@ -45,9 +45,9 @@ export class SlicingBusinessTableComponent implements OnInit { this.isSelect = true; } this.myhttp.getSlicingBusinessList(paramsObj,this.isSelect).subscribe (res => { - const { result_header: { result_code }, result_body: { slicing_business_list } } = res; + const { result_header: { result_code }, result_body: { slicing_business_list,record_number } } = res; if (+result_code === 200) { - this.total = slicing_business_list.length; + this.total = record_number; this.loading = false; this.listOfData = slicing_business_list.map((item)=>{ if(item.last_operation_progress < 100){ diff --git a/usecaseui-portal/src/styles.less b/usecaseui-portal/src/styles.less index 5d372eb3..4d647f76 100644 --- a/usecaseui-portal/src/styles.less +++ b/usecaseui-portal/src/styles.less @@ -828,4 +828,7 @@ nz-notification-container .ant-notification{ } .slicing-resource-table-list{ padding: 0 20px 0 0!important; +} +.taskmodel_list{ + margin-bottom: 20px; }
\ No newline at end of file |