diff options
4 files changed, 30 insertions, 49 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.html index ad4cb7f6..e6c41aa9 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.html @@ -28,7 +28,8 @@ </tbody> </nz-table> </nz-list> - <nz-list class="taskmodel_list taskmodel_list-margin" nzBordered [nzHeader]="'Related Slicing NSSI List ：'" [nzFooter]="null"> + <nz-list class="taskmodel_list taskmodel_list-margin" nzBordered [nzHeader]="'Related Slicing NSSI List ：'" + [nzFooter]="null"> <nz-table #nssiTable [nzData]="nssiList" [nzShowPagination]="false" nzHideOnSinglePage class="model-table-padding"> <thead> <tr> @@ -45,7 +46,7 @@ <tr> <td>{{ data.service_instance_id }}</td> <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> + <td>{{ data.service_type?data.service_type:"--" }}</td> <td>{{ data.environment_context }}</td> <td>{{ data.orchestration_status }}</td> <td> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html index 7675f4f1..ec11f854 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html @@ -9,26 +9,16 @@ </div> </div> <div class="slicing-resource-table-list"> - <nz-table - #nssiTable - [nzData]="listOfData" - [nzFrontPagination]="false" - nzShowSizeChanger - [nzPageSizeOptions]="[5,10,15,20]" - [nzTotal]='total' - [(nzPageSize)]="pageSize" - [(nzPageIndex)]='pageIndex' - [nzLoading]="loading" - (nzPageIndexChange)="searchData()" - (nzPageSizeChange)="searchData(true)" - > + <nz-table #nssiTable [nzData]="listOfData" [nzFrontPagination]="false" nzShowSizeChanger + [nzPageSizeOptions]="[5,10,15,20]" [nzTotal]='total' [(nzPageSize)]="pageSize" [(nzPageIndex)]='pageIndex' + [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData(true)"> <thead> <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th width="110px">Status</th> - <th width="140px">Detail</th> + <th width=280>Service Instance Id</th> + <th width=280>Service Instance Name</th> + <th width=160>Service Type</th> + <th width=140>Status</th> + <th width=140>Detail</th> </tr> </thead> <tbody> @@ -36,7 +26,7 @@ <tr> <td>{{ data.service_instance_id }}</td> <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> + <td>{{ data.service_type?data.service_type:'--' }}</td> <td>{{data.orchestration_status}}</td> <td> <a (click)="showdetail(data)">View Detail</a> 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 534f18a1..77bb34ef 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 @@ -9,27 +9,17 @@ </div> </div> <div class="slicing-resource-table-list"> - <nz-table - #nsiTable - [nzData]="listOfData" - [nzFrontPagination]="false" - nzShowSizeChanger - [nzPageSizeOptions]="[5,10,15,20]" - [nzTotal]='total' - [(nzPageSize)]="pageSize" - [(nzPageIndex)]='pageIndex' - [nzLoading]="loading" - (nzPageIndexChange)="searchData()" - (nzPageSizeChange)="searchData(true)" - > + <nz-table #nsiTable [nzData]="listOfData" [nzFrontPagination]="false" nzShowSizeChanger + [nzPageSizeOptions]="[5,10,15,20]" [nzTotal]='total' [(nzPageSize)]="pageSize" [(nzPageIndex)]='pageIndex' + [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData(true)"> <thead> <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th width="85px">Context</th> - <th width="110px">Status</th> - <th width="140px">Detail</th> + <th width=280>Service Instance Id</th> + <th width=280>Service Instance Name</th> + <th width=160>Service Type</th> + <th width=120>Context</th> + <th width=110>Status</th> + <th width=140>Detail</th> </tr> </thead> <tbody> @@ -37,7 +27,7 @@ <tr> <td>{{ data.service_instance_id }}</td> <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> + <td>{{ data.service_type?data.service_type:'--' }}</td> <td>{{data.environment_context}}</td> <td>{{data.orchestration_status}}</td> <td> 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 be7db387..ebce5036 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 @@ -14,13 +14,13 @@ [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData(true)"> <thead> <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th width="90px">S-NSSAI</th> - <th width="110px">Status</th> - <th width="140px">Aciton</th> - <th width="110px">Detail</th> + <th width=280>Service Instance Id</th> + <th width=200>Service Instance Name</th> + <th width=110>Service Type</th> + <th width=110>S-NSSAI</th> + <th width=110>Status</th> + <th width=180>Aciton</th> + <th width=110>Detail</th> </tr> </thead> <tbody> @@ -28,7 +28,7 @@ <tr> <td>{{ data.service_instance_id }}</td> <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> + <td>{{ data.service_type?data.service_type:'--' }}</td> <td>{{ data.service_snssai }}</td> <td> <span class="marginLeft10"> |