From e53295bc15043f9d343897f3c8a4b6848cdf0c44 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Thu, 5 Dec 2019 00:29:23 +0800
Subject: feat:Add progress interface query of slicing business page

Change-Id: I8a974d5fa75546a937ad9755a33dee75374fb59d
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../slicing-business-table.component.html                     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html')

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
index fde155a5..07bdc07e 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
@@ -28,8 +28,8 @@
                 <th>Service_type</th>
                 <th>S-NSSAI</th>
                 <th>Orchestration_status</th>
-                <th>Aciton</th>
-                <th>Detail</th>
+                <th width="130px">Aciton</th>
+                <th width="100px">Detail</th>
             </tr>
             </thead>
             <tbody>
@@ -42,14 +42,14 @@
                     <td>
 
                         <span  class="marginLeft10">
-                                 {{ data.last_operation_progress!==100?data.last_operation_type+'&nbsp;&nbsp;&nbsp;'+data.last_operation_progress+'%':data.orchestration_status }}
+                                 {{ data.last_operation_progress !== 100?data.last_operation_type+'&nbsp;&nbsp;&nbsp;'+data.last_operation_progress+'%':data.orchestration_status }}
                         </span>
                         <nz-progress *ngIf="data.last_operation_progress !== 100"
                                      [nzPercent]="data.last_operation_progress"
                                      [nzShowInfo]="false" nzStatus="active"></nz-progress>
                     </td>
                     <td>
-                        <nz-switch [ngModel]="switchStatusAll[i]==='activated'?true:false"
+                        <nz-switch [ngModel]="data.orchestration_status==='activated'?true:false"
                                    [nzDisabled]="data.last_operation_progress !== 100"
                                    (ngModelChange)="switchChange(data,i)"
                         ></nz-switch>
@@ -57,6 +57,7 @@
                            nz-icon
                            nzType="poweroff"
                            nzTheme="outline"
+                           class="anticon anticon-poweroff"
                            (click)="terminate(data)"
                         ></i>
                     </td>
@@ -65,7 +66,7 @@
                            <!--class="anticon anticon-bars"-->
                            <!--(click)="showdetail(data)">-->
                         <!--</i>-->
-                        <i (click)="showdetail(data)" [ngClass]="{'cannotclick':data.last_operation_progress !== 100}">Detail</i>
+                        <a (click)="showdetail(data)" [ngClass]="{'cannotclick':data.last_operation_progress !== 100}">detail</a>
                     </td>
                 </tr>
             </ng-template>
-- 
cgit 1.2.3-korg