From ae3914b676f32b690596c78fa622988f7ed47bf0 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Fri, 10 Apr 2020 15:17:25 +0800
Subject: fix: Fix detail bug of service page

Change-Id: Icf2c90ee347da8e32ada3998717c14f9aba1a1ba
Issue-ID: USECASEUI-370
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../services/services-list/services-list.component.html    | 12 ++++++------
 .../services/services-list/services-list.component.ts      | 14 ++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'usecaseui-portal/src/app/views')

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 58850290..206ce2d6 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
@@ -511,17 +511,17 @@
             </div>
         </ng-template>
     </div>
-    <div class="detailComponent" *ngIf="detailshow">
+    <div class="detailComponent" *ngIf="detailCCVPNShow">
         <app-ccvpn-detail [detailParams]="detailData" [upDateShow]="upDateShow"
             (closeUpdate)="closeCCVPNUpdate($event,templateUpdateSuccessFaild)"
-            (closeDetail)="detailshow = false;listDisplay = false;"></app-ccvpn-detail>
+            (closeDetail)="detailCCVPNShow = false;listDisplay = false;"></app-ccvpn-detail>
     </div>
-    <div class="detailComponent" *ngIf="detailshow2">
-        <app-e2e-detail [detailParams]="detailData" (closeDetail)="detailshow2 = false;listDisplay = false;">
+    <div class="detailComponent" *ngIf="detailNSShow">
+        <app-e2e-detail [detailParams]="detailData" (closeDetail)="detailNSShow = false;listDisplay = false;">
         </app-e2e-detail> 
     </div>
-    <div class="detailComponent" *ngIf="detailshow2">
-        <app-mdons-detail [detailParams]="detailData" (closeDetail)="detailshow2 = false;listDisplay = false;">
+    <div class="detailComponent" *ngIf="detailshowMDONS">
+        <app-mdons-detail [detailParams]="detailData" (closeDetail)="detailshowMDONS = false;listDisplay = false;">
         </app-mdons-detail> 
     </div>
     <div class="createComponent" *ngIf="createshow">
diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
index 96d19cfe..02fdc849 100644
--- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts
@@ -460,8 +460,8 @@ export class ServicesListComponent implements OnInit {
     }
 
     // show detail
-    detailshow = false;
-    detailshow2 = false;
+    detailCCVPNShow = false;
+    detailNSShow = false;
     detailshowMDONS = false;
     upDateShow = false;
     detailData: Object;
@@ -480,14 +480,16 @@ export class ServicesListComponent implements OnInit {
             }
         })
         if (service["serviceDomain"] === 'CCVPN' || service["serviceDomain"] === 'SOTN') {
-            this.detailshow = true;
+            this.detailCCVPNShow = true;
             if (typeNum === 1) {
                 this.upDateShow = false;
             } else {
                 this.upDateShow = true;
             }
-        } else if (service["serviceDomain"] === 'E2E Service' || service["serviceDomain"] === 'Network Service' || service["serviceDomain"] === 'MDONS') {
-            this.detailshow2 = true;
+        } else if (service["serviceDomain"] === 'E2E Service' || service["serviceDomain"] === 'Network Service') {
+            this.detailNSShow = true;
+        }else if( service["serviceDomain"] === 'MDONS'){
+            this.detailshowMDONS = false;
         }
         this.listDisplay = true;
         this.detailData = service;
@@ -999,7 +1001,7 @@ export class ServicesListComponent implements OnInit {
 
     closeCCVPNUpdate(obj, templateUpdateSuccessFaild) {
         console.log(obj);
-        this.detailshow = false;
+        this.detailCCVPNShow = false;
         this.listDisplay = false;
         this.upDateShow = false;
         this.detailData["rate"] = 0;
-- 
cgit 1.2.3-korg