From: cyuamber <xuranyjy@chinamobile.com>
Date: Fri, 27 Dec 2019 07:10:55 +0000 (+0800)
Subject: feat:Optimization service instance list of service page
X-Git-Tag: 2.0.2~49
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F99925%2F1;p=usecase-ui.git

feat:Optimization service instance list of service page

Change-Id: Id29a3caf61aa83faa9662dd98522b6d7b830fac6
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---

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>