diff options
Diffstat (limited to 'usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management')
5 files changed, 185 insertions, 145 deletions
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/constants.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/constants.ts new file mode 100644 index 00000000..b4550fdf --- /dev/null +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/constants.ts @@ -0,0 +1,22 @@ +export const TASK_PROCESSING_STATUS = [ + { + title: "All", + value: "all", + }, + { + title: "Planning", + value: "Planning", + }, + { + title: "WaitingToConfirm", + value: "WaitingToConfirm", + }, + { + title: "Creating", + value: "Creating", + }, + { + title: "Completed", + value: "Completed", + }, +]; 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 d1add64a..0ddc759a 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 @@ -1,151 +1,168 @@ -import {Component, OnInit, Input, SimpleChanges} from '@angular/core'; -import { SlicingTaskServices } from '@src/app/core/services/slicingTaskServices'; -import { TASK_PROCESSING_STATUS } from '@src/constants/constants'; +import { Component, OnInit, Input, SimpleChanges } from "@angular/core"; +import { SlicingTaskServices } from "@src/app/core/services/slicingTaskServices"; +import { TASK_PROCESSING_STATUS } from "./constants"; @Component({ - selector: 'app-slicing-task-management', - templateUrl: './slicing-task-management.component.html', - styleUrls: ['./slicing-task-management.component.less'] + selector: "app-slicing-task-management", + templateUrl: "./slicing-task-management.component.html", + styleUrls: ["./slicing-task-management.component.less"], }) export class SlicingTaskManagementComponent implements OnInit { + constructor(private myhttp: SlicingTaskServices) {} - constructor(private myhttp: SlicingTaskServices) { } + @Input() currentTabTitle; - @Input() currentTabTitle; + showDetail: boolean = false; + showProcess: boolean = false; + selectedValue = "all"; + taskId: string; + moduleTitle: string = ""; + moduleOperation: string; + listOfData: any[] = []; + statusOptions: any[] = TASK_PROCESSING_STATUS; + loading: boolean = false; + total: number = 1; + pageSize: string = "10"; + pageNum: string = "1"; - showDetail: boolean = false; - showProcess: boolean = false; - selectedValue = 'all'; - taskId: string; - moduleTitle: string = ""; - moduleOperation: string; - listOfData: any[] = []; - statusOptions: any[] = TASK_PROCESSING_STATUS; - loading: boolean = false; - total: number = 1; - pageSize: string = '10'; - pageNum: string = '1'; + ngOnChanges(changes: SimpleChanges) { + if ( + changes.currentTabTitle.currentValue === "Slicing Task Management" + ) { + this.getTaskList(); + } + } - ngOnChanges(changes: SimpleChanges) { - if(changes.currentTabTitle.currentValue === 'Slicing Task Management'){ - this.getTaskList(); - } - } + ngOnInit() { + console.log("11.24 1732"); + } - ngOnInit() { - console.log('11.24 1732') - } + getTaskList(): void { + const { pageNum, pageSize } = this; + this.loading = true; + let getSlicingTaskListFailedCallback = () => { + this.loading = false; + }; + this.myhttp + .getSlicingTaskList( + pageNum, + pageSize, + getSlicingTaskListFailedCallback + ) + .then((res) => { + const { slicing_task_list, record_number } = res.result_body; + this.dataFormatting(slicing_task_list); + this.total = record_number; + this.loading = false; + }); + } - getTaskList(): void { - const { pageNum, pageSize } = this; - this.loading = true; - let getSlicingTaskListFailedCallback = () => { - this.loading = false; - } - this.myhttp.getSlicingTaskList(pageNum, pageSize, getSlicingTaskListFailedCallback).then(res => { - const { slicing_task_list, record_number } = res.result_body; - this.dataFormatting(slicing_task_list); - this.total = record_number; - this.loading = false; - }) - } + processingStatusChange(): void { + this.pageSize = "10"; + this.pageNum = "1"; + if (this.selectedValue && this.selectedValue !== "all") { + this.getListOfProcessingStatus(); + } else { + this.getTaskList(); + } + } - processingStatusChange(): void { - this.pageSize = '10'; - this.pageNum = '1'; - if (this.selectedValue && this.selectedValue !== 'all') { - this.getListOfProcessingStatus(); - } else { - this.getTaskList(); - } - } + getListOfProcessingStatus(): void { + const { selectedValue, pageNum, pageSize } = this; + this.loading = true; + let getTaskProcessingStatusFailedCallback = () => { + this.loading = false; + this.listOfData = []; + }; + this.myhttp + .getTaskProcessingStatus( + selectedValue, + pageNum + "", + pageSize + "", + getTaskProcessingStatusFailedCallback + ) + .then((res) => { + const { result_body } = res; + const { slicing_task_list, record_number } = result_body; + this.dataFormatting(slicing_task_list); + this.total = record_number; + this.loading = false; + }); + } - getListOfProcessingStatus(): void { - const { selectedValue, pageNum, pageSize } = this; - this.loading = true; - let getTaskProcessingStatusFailedCallback = () => { - this.loading = false; - this.listOfData = []; - } - this.myhttp.getTaskProcessingStatus(selectedValue, pageNum + '', pageSize + '', getTaskProcessingStatusFailedCallback).then(res => { - const { result_body } = res - const { slicing_task_list, record_number } = result_body; - this.dataFormatting(slicing_task_list) - this.total = record_number; - this.loading = false; - }) - } + pageSizeChange(pageSize: number): void { + this.pageSize = pageSize + ""; + const { selectedValue } = this; + if (selectedValue && selectedValue !== "all") { + this.getListOfProcessingStatus(); + } else { + this.getTaskList(); + } + } - pageSizeChange(pageSize: number): void { - this.pageSize = pageSize + ''; - const { selectedValue } = this; - if (selectedValue && selectedValue !== 'all') { - this.getListOfProcessingStatus(); - } else { - this.getTaskList(); - } - } + pageNumChange(pageNum: number): void { + this.pageNum = pageNum + ""; + const { selectedValue } = this; + if (selectedValue && selectedValue !== "all") { + this.getListOfProcessingStatus(); + } else { + this.getTaskList(); + } + } - pageNumChange(pageNum: number): void { - this.pageNum = pageNum + ''; - const { selectedValue } = this; - if (selectedValue && selectedValue !== 'all') { - this.getListOfProcessingStatus(); - } else { - this.getTaskList(); - } - } + dataFormatting(list: any): void { + this.listOfData = list.map((item) => { + switch (item.processing_status) { + case "Planning": + // item.status = '规划阶段'; + item.operation = "Process Task"; + break; + case "Waiting to Confirm": + // item.status = '审核阶段'; + item.operation = "Process Task"; + break; + case "WaitingToConfirm": + // item.status = '审核阶段'; + item.operation = "Process Task"; + break; + case "Creating": + // item.status = '切片创建中'; + item.operation = "View Progress"; + break; + case "Completed": + // item.status = '创建完成'; + item.operation = "View Result"; + break; + } + return item; + }); + } - dataFormatting(list: any): void { - this.listOfData = list.map(item => { - switch (item.processing_status) { - case 'Planning': - // item.status = '规划阶段'; - item.operation = 'Process Task' - break; - case 'Waiting to Confirm': - // item.status = '审核阶段'; - item.operation = 'Process Task' - break; - case 'WaitingToConfirm': - // item.status = '审核阶段'; - item.operation = 'Process Task' - break; - case 'Creating': - // item.status = '切片创建中'; - item.operation = 'View Progress' - break; - case 'Completed': - // item.status = '创建完成'; - item.operation = 'View Result' - break; - } - return item; - }) - } + showdetail(data: any): void { + this.taskId = data.task_id; + this.moduleTitle = data.task_name; + if ( + data.processing_status === "Waiting to Confirm" || + data.processing_status === "WaitingToConfirm" + ) { + this.showDetail = true; + } else { + this.moduleOperation = data.operation; + this.showProcess = true; + } + } - showdetail(data: any): void { - this.taskId = data.task_id; - this.moduleTitle = data.task_name; - if (data.processing_status === 'Waiting to Confirm' || data.processing_status === 'WaitingToConfirm') { - this.showDetail = true; - } else { - this.moduleOperation = data.operation; - this.showProcess = true; - } - } - - handelCancel(obj: any): void { - this.showDetail = obj.showDetail; - if (obj.bool) { - if (this.selectedValue && this.selectedValue !== 'all') { - this.getListOfProcessingStatus(); - } else { - this.loading = true; - setTimeout(() => { - this.getTaskList() - }, 5000); - } - } - } + handelCancel(obj: any): void { + this.showDetail = obj.showDetail; + if (obj.bool) { + if (this.selectedValue && this.selectedValue !== "all") { + this.getListOfProcessingStatus(); + } else { + this.loading = true; + setTimeout(() => { + this.getTaskList(); + }, 5000); + } + } + } } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html index d095237b..a84fe335 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html @@ -116,7 +116,7 @@ </nz-form-control> <!-- Address selection needs special treatment --> <div *ngIf="title === 'An' && item.type === 'city-select'"> - <app-city-select [areaList]="areaList"></app-city-select> + <app-city-select [areaList]="areaList" [level]="areaLevel"></app-city-select> </div> </nz-form-item> </form> diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.less index 6d5d7739..d3541326 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.less +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.less @@ -15,22 +15,22 @@ min-width: 180px;
}
- .subnet_params_area {
- margin-right: 5px;
- }
+ // .subnet_params_area {
+ // margin-right: 5px;
+ // }
.ant-btn-icon-only {
padding: 0 5px !important;
}
- .subnet_params_button {
- margin-top: 7px;
- margin-left: 10px;
- }
+ // .subnet_params_button {
+ // margin-top: 7px;
+ // margin-left: 10px;
+ // }
- .subnet_params_icon {
- font-size: 14px;
- }
+ // .subnet_params_icon {
+ // font-size: 14px;
+ // }
}
.ant-form-item-label {
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts index c826a7ec..96d31b3c 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts @@ -30,6 +30,7 @@ export class SubnetParamsModelComponent implements OnInit { formData: any; coreFormItems: any = []; areaList: any[] = []; + areaLevel: number = 3; ANEndpointInputs: object = {}; CNEndpointInputs: object = {}; ANkeyList: string[] = []; |