diff options
Diffstat (limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management')
6 files changed, 202 insertions, 262 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 c6f41171..9de2b88d 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 @@ -1,70 +1,59 @@ <nz-spin [nzSpinning]="isSpinning"> -<nz-list class="taskmodel_list" nzBordered [nzHeader]="'Carry Slicing Businress List ：'" [nzFooter]="null"> - <nz-table - #businessTable - [nzData]="businessList" - [nzShowPagination]="false" - nzHideOnSinglePage - class="model-table-padding" - > - <thead> - <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th>S-NSSAI</th> - <th>Status</th> - <th width="100px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="businessTable.data" let-i="index"> - <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{ data.service_snssai }}</td> - <td>{{ data.orchestration_status }}</td> - <td> - <a (click)="showBusinessDetail(data)">detail</a> - </td> - </tr> - </ng-template> - </tbody> - </nz-table> -</nz-list> -<nz-list class="taskmodel_list" nzBordered [nzHeader]="'Include Slicing NSSI List ：'" [nzFooter]="null"> - <nz-table - #nssiTable - [nzData]="nssiList" - [nzShowPagination]="false" - nzHideOnSinglePage - class="model-table-padding" - > - <thead> - <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th>Environment Context</th> - <th>Status</th> - <th width="100px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> - <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{ data.environment_context }}</td> - <td>{{ data.orchestration_status }}</td> - <td> - <a (click)="showNssiDetail(data)">detail</a> - </td> - </tr> - </ng-template> - </tbody> - </nz-table> -</nz-list> + <nz-list class="taskmodel_list" nzBordered [nzHeader]="'Related Slicing Business List ：'" [nzFooter]="null"> + <nz-table #businessTable [nzData]="businessList" [nzShowPagination]="false" nzHideOnSinglePage + class="model-table-padding"> + <thead> + <tr> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>S-NSSAI</th> + <th>Status</th> + <th width="100px">Detail</th> + </tr> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="businessTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{ data.service_snssai }}</td> + <td>{{ data.orchestration_status }}</td> + <td> + <a (click)="showBusinessDetail(data)">View Detail</a> + </td> + </tr> + </ng-template> + </tbody> + </nz-table> + </nz-list> + <nz-list class="taskmodel_list" nzBordered [nzHeader]="'Related Slicing NSSI List ：'" [nzFooter]="null"> + <nz-table #nssiTable [nzData]="nssiList" [nzShowPagination]="false" nzHideOnSinglePage class="model-table-padding"> + <thead> + <tr> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>Environment Context</th> + <th>Status</th> + <th width="100px">Detail</th> + </tr> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{ data.environment_context }}</td> + <td>{{ data.orchestration_status }}</td> + <td> + <a (click)="showNssiDetail(data)">View Detail</a> + </td> + </tr> + </ng-template> + </tbody> + </nz-table> + </nz-list> </nz-spin>
\ No newline at end of file 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 f6291624..d4fad072 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 @@ -3,46 +3,36 @@ <div nz-col nzSpan="12" class="task_status"> <span>Status : </span> <nz-select nzShowSearch nzPlaceHolder="Select a processing status" [(ngModel)]="selectedValue" - (ngModelChange)="getListOfProcessingStatus()"> + (ngModelChange)="getListOfProcessingStatus()"> <nz-option *ngFor="let item of statusOptions" [nzLabel]="item" [nzValue]="item"></nz-option> </nz-select> </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>Status</th> - <th width="140px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{data.orchestration_status}}</td> - <td> - <a (click)="showdetail(data)">detail</a> - </td> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>Status</th> + <th width="140px">Detail</th> </tr> - </ng-template> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{data.orchestration_status}}</td> + <td> + <a (click)="showdetail(data)">View Detail</a> + </td> + </tr> + </ng-template> </tbody> </nz-table> </div> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.html index a5da344e..14806304 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.html @@ -1,34 +1,28 @@ <nz-spin [nzSpinning]="isSpinning"> - <nz-list class="taskmodel_list" nzBordered [nzHeader]="'Carry Slicing Nsi List :'" [nzFooter]="null"> - <nz-table - #nssiTable - [nzData]="nsiList" - [nzShowPagination]="false" - nzHideOnSinglePage - class="model-table-padding" - > - <thead> - <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th>Status</th> - <th width="100px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> - <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{ data.orchestration_status }}</td> - <td> - <a (click)="showSingleNsiDetail(data)">detail</a> - </td> - </tr> - </ng-template> - </tbody> - </nz-table> -</nz-list> + <nz-list class="taskmodel_list" nzBordered [nzHeader]="'Related Slicing Nsi List :'" [nzFooter]="null"> + <nz-table #nssiTable [nzData]="nsiList" [nzShowPagination]="false" nzHideOnSinglePage class="model-table-padding"> + <thead> + <tr> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>Status</th> + <th width="100px">Detail</th> + </tr> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="nssiTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{ data.orchestration_status }}</td> + <td> + <a (click)="showSingleNsiDetail(data)">View Detail</a> + </td> + </tr> + </ng-template> + </tbody> + </nz-table> + </nz-list> </nz-spin>
\ No newline at end of file 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 82e02b24..0b133d86 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 @@ -3,48 +3,38 @@ <div nz-col nzSpan="12" class="task_status"> <span>Status : </span> <nz-select nzShowSearch nzPlaceHolder="Select a processing status" [(ngModel)]="selectedValue" - (ngModelChange)="getListOfProcessingStatus()"> + (ngModelChange)="getListOfProcessingStatus()"> <nz-option *ngFor="let item of statusOptions" [nzLabel]="item" [nzValue]="item"></nz-option> </nz-select> </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>Environment Context</th> - <th>Status</th> - <th width="140px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="nsiTable.data" let-i="index"> <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{data.environment_context}}</td> - <td>{{data.orchestration_status}}</td> - <td> - <a (click)="showdetail(data)">detail</a> - </td> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>Environment Context</th> + <th>Status</th> + <th width="140px">Detail</th> </tr> - </ng-template> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="nsiTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{data.environment_context}}</td> + <td>{{data.orchestration_status}}</td> + <td> + <a (click)="showdetail(data)">View Detail</a> + </td> + </tr> + </ng-template> </tbody> </nz-table> </div> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html index 5a11ab1d..585f6795 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html @@ -1,40 +1,31 @@ <nz-spin [nzSpinning]="isSpinning"> -<app-basic-info - [businessRequirement]="businessRequirement" - [NSTinfo]="NSTinfo" - [taskModel]="taskModel" -> -</app-basic-info> + <app-basic-info [businessRequirement]="businessRequirement" [NSTinfo]="NSTinfo" [taskModel]="taskModel"> + </app-basic-info> <nz-list class="taskmodel_list" nzBordered [nzHeader]="'Slicing NSI :'" [nzFooter]="null"> - <nz-table - #basicTable - [nzData]="nsiInfo" - [nzShowPagination]="false" - nzHideOnSinglePage - class="model-table-padding" - > - <thead> - <tr> - <th>Service Instance Id</th> - <th>Service Instance Name</th> - <th>Service Type</th> - <th>Status</th> - <th width="100px">Detail</th> - </tr> - </thead> - <tbody> - <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index"> - <tr> - <td>{{ data.nsi_id }}</td> - <td>{{ data.nsi_name }}</td> - <td>{{ data.nsi_type }}</td> - <td>{{ data.nsi_orchestration-status }}</td> - <td> - <a (click)="showdetail(data)">detail</a> - </td> - </tr> - </ng-template> - </tbody> - </nz-table> -</nz-list> + <nz-table #basicTable [nzData]="nsiInfo" [nzShowPagination]="false" nzHideOnSinglePage + class="model-table-padding"> + <thead> + <tr> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>Status</th> + <th width="100px">Detail</th> + </tr> + </thead> + <tbody> + <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index"> + <tr> + <td>{{ data.nsi_id }}</td> + <td>{{ data.nsi_name }}</td> + <td>{{ data.nsi_type }}</td> + <td>{{ data.nsi_orchestration_status }}</td> + <td> + <a (click)="showdetail(data)">View Detail</a> + </td> + </tr> + </ng-template> + </tbody> + </nz-table> + </nz-list> </nz-spin>
\ No newline at end of file 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 a8d2407c..998ae287 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 @@ -3,74 +3,60 @@ <div nz-col nzSpan="12" class="task_status"> <span>Status : </span> <nz-select nzShowSearch nzPlaceHolder="Select a processing status" [(ngModel)]="selectedValue" - (ngModelChange)="getListOfProcessingStatus()"> + (ngModelChange)="getListOfProcessingStatus()"> <nz-option *ngFor="let item of statusOptions" [nzLabel]="item" [nzValue]="item"></nz-option> </nz-select> </div> </div> <div class="slicing-resource-table-list"> - <nz-table - #basicTable - [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 #basicTable [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>S-NSSAI</th> - <th>Status</th> - <th width="130px">Aciton</th> - <th width="100px">Detail</th> - </tr> + <tr> + <th>Service Instance Id</th> + <th>Service Instance Name</th> + <th>Service Type</th> + <th>S-NSSAI</th> + <th>Status</th> + <th width="130px">Aciton</th> + <th width="100px">Detail</th> + </tr> </thead> <tbody> - <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index"> - <tr> - <td>{{ data.service_instance_id }}</td> - <td>{{ data.service_instance_name }}</td> - <td>{{ data.service_type }}</td> - <td>{{ data.service_snssai }}</td> - <td> + <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index"> + <tr> + <td>{{ data.service_instance_id }}</td> + <td>{{ data.service_instance_name }}</td> + <td>{{ data.service_type }}</td> + <td>{{ data.service_snssai }}</td> + <td> - <span class="marginLeft10"> - {{ data.last_operation_progress !== 100?data.last_operation_type+' '+data.last_operation_progress+'%':data.orchestration_status }} - </span> - <nz-progress *ngIf="data.last_operation_progress !== 100" - [nzPercent]="data.last_operation_progress" - [nzShowInfo]="false" nzStatus="active"></nz-progress> - </td> - <td> - <nz-switch [ngModel]="data.orchestration_status==='activated'?true:false" - [nzDisabled]="data.last_operation_progress !== 100" - (ngModelChange)="switchChange(data,i)" - ></nz-switch> - <i [ngClass]="{'cannotclick':data.last_operation_progress !== 100}" - nz-icon - nzType="poweroff" - nzTheme="outline" - class="anticon anticon-poweroff" - (click)="terminate(data)" - ></i> - </td> - <td> - <!--<i [ngClass]="{'cannotclick':data.last_operation_progress !== 100}"--> - <!--class="anticon anticon-bars"--> - <!--(click)="showdetail(data)">--> - <!--</i>--> - <a (click)="showdetail(data)" [ngClass]="{'cannotclick':data.last_operation_progress !== 100}">detail</a> - </td> - </tr> - </ng-template> + <span class="marginLeft10"> + {{ data.last_operation_progress !== 100?data.last_operation_type+' '+data.last_operation_progress+'%':data.orchestration_status }} + </span> + <nz-progress *ngIf="data.last_operation_progress !== 100" + [nzPercent]="data.last_operation_progress" [nzShowInfo]="false" nzStatus="active"> + </nz-progress> + </td> + <td> + <nz-switch [ngModel]="data.orchestration_status==='activated'?true:false" + [nzDisabled]="data.last_operation_progress !== 100" + (ngModelChange)="switchChange(data,i)"></nz-switch> + <i [ngClass]="{'cannotclick':data.last_operation_progress !== 100}" nz-icon + nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff" + (click)="terminate(data)"></i> + </td> + <td> + <!--<i [ngClass]="{'cannotclick':data.last_operation_progress !== 100}"--> + <!--class="anticon anticon-bars"--> + <!--(click)="showdetail(data)">--> + <!--</i>--> + <a (click)="showdetail(data)" + [ngClass]="{'cannotclick':data.last_operation_progress !== 100}">View Detail</a> + </td> + </tr> + </ng-template> </tbody> </nz-table> </div> |