From 97c18e70d0d79dedc07118a2ceef20fc41d7ac48 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Wed, 3 Apr 2019 17:39:21 +0800
Subject: Service instance lifecycle management

Change-Id: Ibdf6cc1da4a4cbb129e64132ba7abfdbb189e05c
Issue-ID: USECASEUI-218
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 .../services-list/services-list.component.html       |  2 +-
 .../services-list/services-list.component.less       |  3 +++
 .../services-list/services-list.component.ts         | 20 +++++++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'usecaseui-portal/src/app/services/services-list')

diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html
index 9e36c7b3..c09b15be 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.html
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html
@@ -174,7 +174,7 @@
                         <i [ngClass]="{'cannotclick':data.status == 'In Progress'}" class="anticon anticon-delete"
                            (click)="deleteModel(data)"></i>
                         <i [ngClass]="{'cannotclick':data.status == 'In Progress'}" class="anticon anticon-ellipsis"
-                           (click)="iconMoreShow(data)" style="transform: rotate(90deg);"></i>
+                           (click)="iconMoreShow(data,tableData)" style="transform: rotate(90deg);"></i>
 
                         <ul *ngIf="data.iconMore==true " class="icon-more">
                             <li>
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.less b/usecaseui-portal/src/app/services/services-list/services-list.component.less
index ec4a7f76..48d03b16 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.less
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.less
@@ -273,12 +273,15 @@ hr {
 }
 .nsColor{
     background:linear-gradient(135deg,rgba(252,167,91,1) 0%,rgba(253,203,106,1) 100%);
+    border-radius:4px;
 }
 .ccvpnColor{ 
     background:linear-gradient(135deg,rgba(81,113,251,1) 0%,rgba(201,123,254,1) 100%);
+    border-radius:4px;
 }
 .sotnColor{
     background:linear-gradient(133deg,rgba(24,179,170,1) 0%,rgba(70,216,178,1) 100%);
+    border-radius:4px;
 }
 .voLTEColor{    
     background:#0AD251;
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
index ed724383..2ddf1cad 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
@@ -68,12 +68,18 @@ export class ServicesListComponent implements OnInit {
     ];
 
     //The icon behind each row of data in the table expands
-    iconMoreShow(data){
-        if(data.iconMore==false){
-            data.iconMore=true;
-        }else {
-            data.iconMore=false;
-        }
+    iconMoreShow(data,tableData){
+        tableData.map((its) => {
+            if(its["service-instance-id"]==data["service-instance-id"]){
+                if(its["iconMore"]==false){
+                    data.iconMore=true;
+                }else if(its["iconMore"]==true) {
+                    data.iconMore=false;
+                }
+            }else{
+                its["iconMore"]=false;
+            }
+        })
     }
   getallCustomers(){
     console.log(this.listSortMasters);
@@ -273,7 +279,7 @@ export class ServicesListComponent implements OnInit {
             item["tips"] = "Available";
             item["statusClass"] = item["operationResult"];
           }
-  // 2018.12.13日
+  // 2018.12.13
           else if(item["operationResult"]=="2002"){ //operationResult==2002
             if(item["operationType"]=="1001"||item["operationType"]=="1002"){
                 // item["status"] = this.accordingState["operationResult"][item["operationResult"]];
-- 
cgit 1.2.3-korg