From c6b270f19596b513d4a855d40c55ac754b726955 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Tue, 25 Feb 2020 10:50:45 +0800
Subject: feat:Optimize the code of CSMF slicing page

Change-Id: I1643dc7522678c66a6baf1e493daf6a3f29a2b57
Issue-ID: USECASEUI-368
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../csmf-slicing-business-management.component.html                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
index 0c3983dd..936338dc 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
@@ -12,7 +12,7 @@
   <div class="slicing-resource-table-list">
     <nz-table #basicTable [nzData]="listOfData" [nzFrontPagination]="false" nzShowSizeChanger
       [nzPageSizeOptions]="[5,10,15,20]" [nzTotal]='total' [(nzPageSize)]="pageSize" [(nzPageIndex)]='pageIndex'
-      [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData(true)">
+      [nzLoading]="loading" (nzPageIndexChange)="searchData()" (nzPageSizeChange)="searchData()">
       <thead>
         <tr>
           <th width=100>No</th>
@@ -44,7 +44,7 @@
             <td>
               <div class="action-icon">
                 <nz-switch [ngModel]="data.order_status==='activated'?true:false"
-                  [nzDisabled]="data.order_status === 'processing'|| (data.order_status !== 'processing' && data.last_operation_progress && data.last_operation_progress !== '100')"
+                  [nzDisabled]="data.order_status === 'processing' || data.order_status === 'error' || (data.order_status !== 'processing' && data.last_operation_progress && data.last_operation_progress !== '100')"
                   (ngModelChange)="switchChange(data,i)"></nz-switch>
                 <nz-progress
                   *ngIf="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && data.last_operation_type !== 'DELETE'"
@@ -54,7 +54,7 @@
             </td>
             <td>
               <div class="action-icon">
-                <i [ngClass]="{'cannotclick':data.order_status === 'processing' || ( data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type === 'DELETE' || data.last_operation_type === 'activated'))}"
+                <i [ngClass]="{'cannotclick':data.order_status === 'processing' || data.order_status === 'error' || ( data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type === 'DELETE' || data.last_operation_type === 'activated'))}"
                   nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
                   (click)="terminate(data,i)"></i>
                 <nz-progress
-- 
cgit 1.2.3-korg