feat: change parameters of task status

Change-Id: If4e057511bbfb0c70ad637bb1811877a99c8b5d7
Issue-ID: USECASEUI-368
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

diff --git a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
index b4aadc1..daa16b9 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -54,4 +54,4 @@
         }\r
 \r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/usecaseui-portal/src/app/mock/json/slicing_task_processing_status.json b/usecaseui-portal/src/app/mock/json/slicing_task_processing_status.json
index 4a113ef..c85eb34 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/slicing_task_processing_status.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_processing_status.json
@@ -5,14 +5,13 @@
     },\r
     "result_body": {\r
         "record_number": 2,\r
-        "slicing_task_list": [\r
-            {\r
+        "slicing_task_list": [{\r
                 "task_id": "b1bb0ce7-ebca-4fa7-95ed-4840d70a1177",\r
                 "task_name": "5G Slice service eMMB",\r
                 "service_snssai": "1-010101",\r
                 "service_type": "eMMB",\r
                 "arrival_time": "1454171445000",\r
-                "processing_status": "Waiting to Confirm"\r
+                "processing_status": "WaitingToConfirm"\r
             },\r
             {\r
                 "task_id": "b1bb0de7-ebca-4fa7-95ed-4840d7041177",\r
@@ -20,7 +19,7 @@
                 "service_snssai": "1-010101",\r
                 "service_type": "eMMB",\r
                 "arrival_time": "1544471445000",\r
-                "processing_status": "Waiting to Confirm"\r
+                "processing_status": "WaitingToConfirm"\r
             }\r
         ]\r
     }\r

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 35bd191..b99ee8e 100644 (file)
--- 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
@@ -42,8 +42,8 @@ export class SlicingTaskManagementComponent implements OnInit {
         this.message.error('Failed to get form data');
       }
       this.loading = false;
-    },({status, statusText}) => {
-                       this.message.error(status + ' (' + statusText + ')');
+    }, ({ status, statusText }) => {
+      this.message.error(status + ' (' + statusText + ')');
       this.loading = false;
     })
   }
@@ -71,8 +71,8 @@ export class SlicingTaskManagementComponent implements OnInit {
         this.message.error('Failed to get form data');
       }
       this.loading = false;
-    }, ({status, statusText}) => {
-                       this.message.error(status + ' (' + statusText + ')');
+    }, ({ status, statusText }) => {
+      this.message.error(status + ' (' + statusText + ')');
       this.listOfData = [];
       this.loading = false;
     })
@@ -109,6 +109,10 @@ export class SlicingTaskManagementComponent implements OnInit {
           // item.status = '审核阶段';
           item.operation = 'Process Task'
           break;
+        case 'WaitingToConfirm':
+          // item.status = '审核阶段';
+          item.operation = 'Process Task'
+          break;
         case 'Creating':
           // item.status = '切片创建中';
           item.operation = 'View Progress'
@@ -125,7 +129,7 @@ export class SlicingTaskManagementComponent implements OnInit {
   showdetail(data: any): void {
     this.taskId = data.task_id;
     this.moduleTitle = data.task_name;
-    if (data.processing_status === 'WaitingToConfirm') {
+    if (data.processing_status === 'Waiting to Confirm' || data.processing_status === 'WaitingToConfirm') {
       this.showDetail = true;
     } else {
       this.moduleOperation = data.operation;
@@ -133,7 +137,7 @@ export class SlicingTaskManagementComponent implements OnInit {
     }
   }
 
-  handelCancel(obj: any):void {
+  handelCancel(obj: any): void {
     this.showDetail = obj.showDetail;
     if (obj.bool) {
       if (this.selectedValue && this.selectedValue !== 'all') {

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index 7db7657..b3ce681 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -85,9 +85,9 @@ export const BUSINESS_REQUIREMENT = [
                        key: 'area'\r
                },\r
        ],\r
-       \r
-       \r
-] \r
+\r
+\r
+]\r
 \r
 export const WIRELESS_FORM_ITEMS = [\r
        {\r
@@ -115,7 +115,7 @@ export const TRANSFRER_FORM_ITEMS = [
        }\r
 ]\r
 \r
-export const CORE_FORM_ITEMS =         [\r
+export const CORE_FORM_ITEMS = [\r
        {\r
                title: 'S-NSSAI',\r
                key: 'cn_service_snssai'\r