From 9cb46ebe39c48dc617e32bdffb4a5c63d04eba9d Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Tue, 10 Dec 2019 16:01:41 +0800
Subject: feat: add english status Issue-ID: USECASEUI-368 Change-Id:
 Id7acfd53cf2b34ff28add9d69e45c943c0977785 Signed-off-by: cyuamber
 <xuranyjy@chinamobile.com>

---
 .../slicing-task-management.component.html         | 79 +++++++---------------
 .../slicing-task-management.component.less         | 11 +--
 .../slicing-task-management.component.ts           | 16 ++---
 3 files changed, 38 insertions(+), 68 deletions(-)

(limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management')

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
index ff5ec273..c4aeb72e 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.html
@@ -2,45 +2,26 @@
 	<div nz-row>
 		<div nz-col nzSpan="12" class="task_status">
 			<span>Status : </span>
-			<nz-select
-				nzShowSearch
-				nzAllowClear
-				[(ngModel)]="selectedValue"
-				nzPlaceHolder="Select a processing status"
-				(ngModelChange)="processingStatusChange()"
-			>
-				<nz-option
-					*ngFor="let item of statusOptions"
-					[nzLabel]="item.title"
-					[nzValue]="item.value"
-				></nz-option>
+			<nz-select nzShowSearch nzAllowClear [(ngModel)]="selectedValue" nzPlaceHolder="Select a processing status"
+				(ngModelChange)="processingStatusChange()">
+				<nz-option *ngFor="let item of statusOptions" [nzLabel]="item.title" [nzValue]="item.value"></nz-option>
 			</nz-select>
 		</div>
 	</div>
 	<div>
-		<nz-table
-			#basicTable
-			nzShowPagination
-			nzPageSizeOptions
-			nzShowSizeChanger
-			[nzTotal]="total"
-			[nzLoading]="loading"
-			[nzData]="listOfData"
-			[nzPageIndex]="pageNum"
-			[nzPageSize]="pageSize"
-			[nzFrontPagination]="false"
-			(nzPageSizeChange)="pageSizeChange($event)"
-			(nzPageIndexChange)="pageNumChange($event)"
-		>
+		<nz-table #basicTable nzShowPagination nzPageSizeOptions nzShowSizeChanger [nzTotal]="total"
+			[nzLoading]="loading" [nzData]="listOfData" [nzPageIndex]="pageNum" [nzPageSize]="pageSize"
+			[nzFrontPagination]="false" (nzPageSizeChange)="pageSizeChange($event)"
+			(nzPageIndexChange)="pageNumChange($event)">
 			<thead>
 				<tr>
-					<th>任务ID</th>
-					<th>任务名称</th>
+					<th>Task ID</th>
+					<th>Task Name</th>
 					<th>S-NSSAI</th>
-					<th>切片业务类型</th>
-					<th>到达时间</th>
-					<th>处理环节</th>
-					<th>操作</th>
+					<th>Service Type</th>
+					<th>Created time</th>
+					<th>Status</th>
+					<th>Action</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -50,35 +31,21 @@
 					<td>{{ data.service_snssai }}</td>
 					<td>{{ data.service_type }}</td>
 					<td>{{ data.create_time | date: "yyyy-MM-dd HH:mm:ss"}}</td>
-					<td>{{ data.status }}</td>
+					<td>{{ data.processing_status }}</td>
 					<td>
-						<span
-							*ngIf="data.processing_status === 'Planning'"
-							class="task_operation_disabled"
-							>{{ data.operation }}</span
-						>
-						<a
-							(click)="showdetail(data)"
-							*ngIf="data.processing_status !== 'Planning'"
-							>{{ data.operation }}</a
-						>
+						<span *ngIf="data.processing_status === 'Planning'"
+							class="task_operation_disabled">{{ data.operation }}</span>
+						<a (click)="showdetail(data)"
+							*ngIf="data.processing_status !== 'Planning'">{{ data.operation }}</a>
 					</td>
 				</tr>
 			</tbody>
 		</nz-table>
 	</div>
-	<app-slicing-task-model
-		[moduleTitle]="moduleTitle"
-		[showDetail]="showDetail"
-		[taskId]="taskId"
-		(cancel)="showDetail = $event"
-	>
+	<app-slicing-task-model [moduleTitle]="moduleTitle" [showDetail]="showDetail" [taskId]="taskId"
+		(cancel)="showDetail = $event">
 	</app-slicing-task-model>
-	<app-check-process-model
-		[moduleTitle]="moduleTitle"
-		[showProcess]="showProcess"
-		[taskId]="taskId"
-		(cancel)="showProcess = $event"
-	>
+	<app-check-process-model [moduleTitle]="moduleTitle" [showProcess]="showProcess" [taskId]="taskId"
+		(cancel)="showProcess = $event">
 	</app-check-process-model>
-</div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.less
index bc14d4ff..da4aa09f 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.less
@@ -1,13 +1,16 @@
 nz-select {
-    width: 200px;
+    width: 220px;
 }
-.task_status{
+
+.task_status {
     margin-bottom: 20px;
-    span{
+
+    span {
         margin-right: 5%;
     }
 }
+
 .task_operation_disabled {
     color: #A2ABCE;
     cursor: default;
-}
+}
\ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
index fd135a61..e9cb8398 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
@@ -94,20 +94,20 @@ export class SlicingTaskManagementComponent implements OnInit {
     this.listOfData = list.map(item => {
       switch (item.processing_status) {
         case 'Planning':
-          item.status = '规划阶段';
-          item.operation = '任务处理'
+          // item.status = '规划阶段';
+          item.operation = 'Process Task'
           break;
         case 'Waiting to Confirm':
-          item.status = '审核阶段';
-          item.operation = '任务处理'
+          // item.status = '审核阶段';
+          item.operation = 'Process Task'
           break;
         case 'Creating':
-          item.status = '切片创建中';
-          item.operation = '查看进度'
+          // item.status = '切片创建中';
+          item.operation = 'View Progress'
           break;
         case 'Completed':
-          item.status = '创建完成';
-          item.operation = '查看结果'
+          // item.status = '创建完成';
+          item.operation = 'View Result'
           break;
       }
       return item;
-- 
cgit 1.2.3-korg