diff options
9 files changed, 36 insertions, 15 deletions
diff --git a/usecaseui-portal/proxy.conf.json b/usecaseui-portal/proxy.conf.json index d96a964e..66b811de 100644 --- a/usecaseui-portal/proxy.conf.json +++ b/usecaseui-portal/proxy.conf.json @@ -1,6 +1,6 @@ { "/api/usecaseui-server/v1": { - "target": "https://192.168.235.77:30283", + "target": "https://159.138.57.166:30283", "secure": false, "logLevel": "debug", "changeOrigin": true diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts index 99cbde98..c624c64c 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts @@ -197,9 +197,11 @@ export class BusinessOrderComponent implements OnInit { this.isSpinning = true; this.myhttp.csmfSlicingPurchase(paramsObj).subscribe(res => { const {result_header: {result_code}} = res; + this.isSpinning = false; if (+result_code === 200) { - this.isSpinning = false; this.handleCancel(); + }else{ + this.message.error(res.result_header.result_message) } }, (err) => { this.message.error(err); diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts index 73736f97..9f6a9236 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts @@ -74,6 +74,8 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit { return item }); } + }else{ + this.message.error(res.result_header.result_message) } }) } @@ -129,6 +131,7 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit { let singleSlicing = Object.assign({}, this.listOfData[index]); this.listOfData[index] = singleSlicing; this.listOfData = [...this.listOfData]; + this.message.error(res.result_header.result_message) this.getCSMFBusinessList(); } this.getCSMFBusinessList(); @@ -156,6 +159,7 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit { this.getCSMFBusinessList(); } else { this.terminateStart[index] = false; + this.message.error(res.result_header.result_message) } }, () => { this.loading = false; diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts index 0ae21d45..71b3aba9 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {NzModalService} from "ng-zorro-antd"; +import {NzModalService, NzMessageService} from "ng-zorro-antd"; import {SlicingTaskServices} from '.././../../../../../core/services/slicingTaskServices'; import { SlicingBusinessModelComponent } from '../../slicing-business-management/slicing-business-model/slicing-business-model.component'; import { NssiModelComponent } from '../../nssi-management/nssi-model/nssi-model.component'; @@ -12,7 +12,8 @@ export class NsiModelComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, - private modalService: NzModalService + private modalService: NzModalService, + private message: NzMessageService ) { } @Input() nsiId; @@ -37,6 +38,8 @@ export class NsiModelComponent implements OnInit { return item } }); + }else{ + this.message.error(res.result_header.result_message) } }) } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts index 3c08463d..08716e98 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts @@ -2,7 +2,7 @@ import {Component, Input, OnInit,SimpleChanges} from '@angular/core'; import {BUSINESS_STATUS} from '../../../../../../../constants/constants'; import {SlicingTaskServices} from "../../../../../../core/services/slicingTaskServices"; import {NsiModelComponent} from "../nsi-model/nsi-model.component"; -import {NzModalService} from 'ng-zorro-antd'; +import {NzModalService, NzMessageService} from 'ng-zorro-antd'; @Component({ selector: 'app-nsi-table', @@ -13,7 +13,8 @@ export class NsiTableComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, - private modalService: NzModalService + private modalService: NzModalService, + private message: NzMessageService ) { } @@ -56,10 +57,12 @@ export class NsiTableComponent implements OnInit { if (nsi_service_instances !== null && nsi_service_instances.length > 0) { this.listOfData = nsi_service_instances; } + }else { + this.message.error(res.result_header.result_message) } }, (res) => { this.loading = false; - console.error(res); + this.message.error(res); }) } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts index e20d81ed..96abbeca 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {NzModalService} from "ng-zorro-antd"; +import {NzModalService, NzMessageService} from "ng-zorro-antd"; import {SlicingTaskServices} from '.././../../../../../core/services/slicingTaskServices'; import { NsiModelComponent } from '../../nsi-management/nsi-model/nsi-model.component'; @Component({ @@ -11,7 +11,8 @@ export class NssiModelComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, - private modalService: NzModalService + private modalService: NzModalService, + private message: NzMessageService ) { } @Input() nssiId; @@ -30,6 +31,8 @@ export class NssiModelComponent implements OnInit { return item } }); + }else{ + this.message.error(res.result_header.result_message) } }) } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts index 6dec5c72..ba2b8971 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component.ts @@ -1,7 +1,7 @@ import {Component, Input, OnInit,SimpleChanges} from '@angular/core'; import {BUSINESS_STATUS} from '../../../../../../../constants/constants'; import {SlicingTaskServices} from "../../../../../../core/services/slicingTaskServices"; -import {NzModalService} from 'ng-zorro-antd'; +import {NzModalService, NzMessageService} from 'ng-zorro-antd'; import {NssiModelComponent} from "../nssi-model/nssi-model.component"; @Component({ @@ -13,7 +13,8 @@ export class NssiTableComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, - private modalService: NzModalService + private modalService: NzModalService, + private message: NzMessageService ) { } @@ -56,10 +57,12 @@ export class NssiTableComponent implements OnInit { if (nssi_service_instances !== null && nssi_service_instances.length > 0) { this.listOfData = nssi_service_instances; } + }else{ + this.message.error(res.result_header.result_message) } }, (res) => { this.loading = false; - console.error(res); + this.message.error(res) }) } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts index e2867489..b27e5a31 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; -import { NzModalService } from "ng-zorro-antd"; +import { NzModalService, NzMessageService } from "ng-zorro-antd"; import { SlicingTaskServices } from '.././../../../../../core/services/slicingTaskServices'; import { NsiModelComponent } from "../../nsi-management/nsi-model/nsi-model.component"; @@ -12,7 +12,8 @@ export class SlicingBusinessModelComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, - private modalService: NzModalService + private modalService: NzModalService, + private message: NzMessageService ) { } @@ -47,6 +48,8 @@ export class SlicingBusinessModelComponent implements OnInit { if (nsi_info.nsi_id !== null) { this.nsiInfo = [nsi_info]; } + }else{ + this.message.error(res.result_header.result_message) } }) } diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 14089b0b..93cdc71e 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -277,7 +277,7 @@ export const COMMUNICATION_FORM_ITEMS = [ },
{
title: 'Non-shared',
- key: 'no-shared'
+ key: 'non-shared'
}
]
},
|