summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyuamber <xuranyjy@chinamobile.com>2019-12-27 15:10:55 +0800
committercyuamber <xuranyjy@chinamobile.com>2019-12-27 15:11:00 +0800
commit9503c398fcbf257cda1b590f4a4e14083fd2053c (patch)
tree2de90dc92e9893c32f9aab2a304330a516af077f
parent6f871653cde9c4579527bddf65fd9684f22eff60 (diff)
feat:Optimization service instance list of service page
Change-Id: Id29a3caf61aa83faa9662dd98522b6d7b830fac6 Issue-ID: USECASEUI-369 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
-rw-r--r--usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/services-list/services-list.component.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts
index f1df9636..91ac1031 100644
--- a/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts
@@ -104,7 +104,7 @@ export class E2eCreationComponent implements OnInit {
} else if (type == "ns") {
if (data["model"] != undefined && typeof data["model"] == 'string') {
this.nsTemplateParameters = JSON.parse(data["model"]);
- console.log(data["model"]);
+ console.log(data["model"],"----------1111");
} else {
this.nsTemplateParameters = data;
}
diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html
index 8e07eea0..856253a2 100644
--- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html
@@ -86,7 +86,7 @@
<ng-template ngFor let-data [ngForOf]="nzTable.data" let-i="index">
<tr>
<td>{{pageSize*(pageIndex-1) + i+1}}</td>
- <td [nzShowExpand]="data.childServiceInstances[0]" [(nzExpand)]="data.expand"></td>
+ <td [nzShowExpand]="data.childServiceInstances?data.childServiceInstances[0]:null" [(nzExpand)]="data.expand"></td>
<td>{{data["service-instance-name"] || data.nsName}}</td>
<td>{{data["service-instance-id"] || data.nsInstanceId}}</td>
<td>
@@ -130,7 +130,7 @@
</ul>
</td>
</tr>
- <tr class="childtr" [nzExpand]="data.expand" *ngFor="let item of data.childServiceInstances">
+ <tr class="childtr" [nzExpand]="data.expand" *ngFor="let item of data.childServiceInstances?data.childServiceInstances[0]:null">
<td></td>
<td></td>
<td>{{item["service-instance-id"] || item.nsInstanceId || item.vnfInstanceId}}</td>