From 31509ed10df8d254647bbad39739f42b378cff90 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Mon, 9 Dec 2019 18:24:43 +0800 Subject: feat: support jonit test Change-Id: Id337965c68f9636cab8dc14b9ba91773bdefebe3 Issue-ID: USECASEUI-352 Signed-off-by: cyuamber --- .../slicing-task-management.component.html | 37 ++++----------- .../slicing-task-management.component.ts | 54 +++++++++++----------- 2 files changed, 37 insertions(+), 54 deletions(-) (limited to 'usecaseui-portal/src/app/views/services/slicing-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 943b946d..85ed0880 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,30 +2,16 @@
Status : - +
- + 任务ID @@ -43,10 +29,11 @@ {{ data.task_name }} {{ data.service_snssai }} {{ data.service_type }} - {{ data.arrival_time }} + {{ data.create_time }} {{ data.status }} - {{ data.operation }} + {{ data.operation }} {{ data.operation }} @@ -56,11 +43,7 @@ - +
\ 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 26f485b9..e70e6d44 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 @@ -12,27 +12,27 @@ import { TASK_PROCESSING_STATUS } from '../../../../../constants/constants'; export class SlicingTaskManagementComponent implements OnInit { constructor(private myhttp: SlicingTaskServices, private message: NzMessageService) { } - + showDetail: boolean = false; showProcess: boolean = false; selectedValue = null; taskId: string; moduleTitle: string = ""; - listOfData: any[] = []; + listOfData: any[] = []; statusOptions: any[] = TASK_PROCESSING_STATUS; loading: boolean = false; total: number = 1; pageSize: string = '10'; pageNum: string = '1'; - ngOnInit() { + ngOnInit() { this.getTaskList() } - getTaskList (): void{ + getTaskList(): void { const { pageNum, pageSize } = this; this.loading = true; - this.myhttp.getSlicingTaskList(pageNum, pageSize).subscribe (res => { + this.myhttp.getSlicingTaskList(pageNum, pageSize).subscribe(res => { const { result_header: { result_code }, result_body } = res if (+result_code === 200) { const { slicing_task_list, record_number } = result_body; @@ -40,12 +40,12 @@ export class SlicingTaskManagementComponent implements OnInit { this.total = record_number; } else { this.message.error('Failed to get form data') - } + } this.loading = false; }) } - processingStatusChange():void { + processingStatusChange(): void { this.pageSize = '10'; this.pageNum = '1'; if (this.selectedValue) { @@ -55,23 +55,23 @@ export class SlicingTaskManagementComponent implements OnInit { } } - getListOfProcessingStatus (): void { + getListOfProcessingStatus(): void { const { selectedValue, pageNum, pageSize } = this; this.loading = true; - this.myhttp.getTaskProcessingStatus(selectedValue, pageNum+'', pageSize+'').subscribe (res => { - const { result_header: { result_code }, result_body } = res - if (+result_code === 200) { - const { slicing_task_list,record_number } = result_body; - this.dataFormatting(slicing_task_list) - this.total = record_number; - } else { - this.message.error('Failed to get form data') - } - this.loading = false; - }) + this.myhttp.getTaskProcessingStatus(selectedValue, pageNum + '', pageSize + '').subscribe(res => { + const { result_header: { result_code }, result_body } = res + if (+result_code === 200) { + const { slicing_task_list, record_number } = result_body; + this.dataFormatting(slicing_task_list) + this.total = record_number; + } else { + this.message.error('Failed to get form data') + } + this.loading = false; + }) } - pageSizeChange (pageSize: number): void{ + pageSizeChange(pageSize: number): void { this.pageSize = pageSize + ''; const { selectedValue } = this; if (selectedValue) { @@ -81,7 +81,7 @@ export class SlicingTaskManagementComponent implements OnInit { } } - pageNumChange (pageNum: number): void{ + pageNumChange(pageNum: number): void { this.pageNum = pageNum + ''; const { selectedValue } = this; if (selectedValue) { @@ -91,10 +91,10 @@ export class SlicingTaskManagementComponent implements OnInit { } } - dataFormatting(list: any):void{ - this.listOfData = list.map( item => { - item.arrival_time = moment(+item.arrival_time).format('YYYY-MM-DD hh:mm') - switch (item.processing_status){ + dataFormatting(list: any): void { + this.listOfData = list.map(item => { + item.create_time = moment(item.create_time).format('YYYY-MM-DD hh:mm') + switch (item.processing_status) { case 'Planning': item.status = '规划阶段'; item.operation = '任务处理' @@ -107,7 +107,7 @@ export class SlicingTaskManagementComponent implements OnInit { item.status = '切片创建中'; item.operation = '查看进度' break; - case 'Completed': + case 'Completed': item.status = '创建完成'; item.operation = '查看结果' break; @@ -119,7 +119,7 @@ export class SlicingTaskManagementComponent implements OnInit { showdetail(data: any): void { this.taskId = data.task_id; this.moduleTitle = data.status; - if(data.status === '审核阶段') { + if (data.status === '审核阶段') { this.showDetail = true; } else { this.showProcess = true; -- cgit 1.2.3-korg