diff options
| author |   cyuamber <xuranyjy@chinamobile.com> | 2019-12-09 01:20:06 +0800 |
|---|---|---|
| committer | cyuamber <xuranyjy@chinamobile.com> | 2019-12-09 01:23:36 +0800 |
| commit | 7685cee34d8a8294306c94b2018c9345fe78020c (patch) | |
| tree | 84b93670a744c96c9b239ba230073771c5ce99bb | |
| parent | 6aa6f5cc8b6a4a54016a271ccf7dac14827aff43 (diff) | |
feat: add interface url and Modifying common components
Change-Id: I8eb49db034ee54d7f30b79a3291f1c820ad415ce
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
3 files changed, 10 insertions, 2 deletions
diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js index b25ada4f..3a5eb950 100644 --- a/usecaseui-portal/src/app/mock/routes.js +++ b/usecaseui-portal/src/app/mock/routes.js @@ -109,11 +109,14 @@ module.exports = "/PUT/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate", "/DELETE/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate", "/uui-slicing/nsmf/resource/:serviceId/progress":"/getSlicingBusinessProgress", + "/uui-slicing/nsmf/resource/business/:businessId/details":"/getSlicingBusinessDetail", ///////<-------------slicing_nsi--------->///// "/uui-slicing/nsmf/resource/nsi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list_activated", + "/uui-slicing/nsmf/resource/nsi/:nsiId/details":"/getSlicingNsiDetail", ///////<-------------slicing_nssi--------->///// "/uui-slicing/nsmf/resource/nssi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list", "/uui-slicing/nsmf/resource/nssi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list_activated", + "/uui-slicing/nsmf/resource/nssi/:nssiId/details":"/getSlicingNssiDetail", ///////<-------------general interface--------->///// "/api/*": "/$1", "/*/*": "/$1_$2", diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html index 8a6cbf23..5a600ce3 100644 --- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html +++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.html @@ -1,4 +1,4 @@ -<nz-list class="taskmodel_list" [nzDataSource]="checkDetail" nzBordered [nzHeader]="'配置审核详情：'" [nzFooter]="null" +<nz-list class="taskmodel_list" [nzDataSource]="checkDetail" nzBordered [nzHeader]="'配置审核详情：'" [nzFooter]="null" *ngIf="taskModel!==false" [nzRenderItem]="checkItem"> <ng-template #checkItem let-check> <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8"> @@ -28,7 +28,11 @@ <ng-template #businessItem let-item> <nz-list-item nz-row nzType="flex" nzJustify="start" [nzGutter]="8" *ngFor="let list of businessList "> <div nz-col [nzSpan]="list.length === 1 ? '24' : '8'" *ngFor="let ite of list"> - <span class="ant-typography">{{ ite.title }} : {{ item[ite.key] }}</span> + <span class="ant-typography" *ngIf="ite!=='区域'">{{ ite.title }} : {{ item[ite.key] }}</span> + <span class="ant-typography" *ngIf="ite==='区域'"> + {{ ite.title }} : + <span style="display: inline-block" *ngFor="let items of item[ite.key]">{{ items }} </span> + </span> </div> </nz-list-item> </ng-template> diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts index 0f096b71..d718d9d3 100644 --- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts +++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts @@ -10,6 +10,7 @@ export class BasicInfoComponent implements OnInit { @Input() checkDetail: any; @Input() businessRequirement: any; @Input() NSTinfo: any; + @Input() taskModel: any; // 业务需求列表 businessList: object[] = BUSINESS_REQUIREMENT; |