From d8f2792db89ec0e20751be2bf6be04a2f8382b1a Mon Sep 17 00:00:00 2001 From: wangyuerg Date: Tue, 24 Nov 2020 17:52:01 +0800 Subject: fix: fix the bug of params and delete pakagefiles Signed-off-by: wangyuerg Change-Id: I05c46f4cfc0edb8260ae1185bd745878d7da6c9f Issue-ID: USECASEUI-444 --- .../src/app/mock/json/slicing_task_auditInfo.json | 6 ++-- .../check-process-model.component.html | 2 +- .../slicing-task-management.component.ts | 4 ++- .../slicing-task-model.component.ts | 2 +- .../subnet-params-model.component.ts | 34 +++++++++++----------- usecaseui-portal/src/constants/constants.ts | 2 +- 6 files changed, 26 insertions(+), 24 deletions(-) (limited to 'usecaseui-portal/src') 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 1828367d..fe7e5a1e 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json +++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json @@ -66,9 +66,9 @@ "tn_bh_bandwidth": "300", "tn_bh_script_name":"test_tn_01", "sliceProfile_TN_BH_jitte":"test_tn_jitter_01", - "sliceProfile_TN_BH _pLMNIdList": "test_sliceProfile_TN_BH _pLMNIdList", - "sliceProfile_TN_BH _sST": "test_sliceProfile_TN_BH _sST", - "sliceProfile_TN_BH _sNSSAI":"test_tn_service_snssai_01", + "sliceProfile_TN_BH_pLMNIdList": "test_sliceProfile_TN_BH_pLMNIdList", + "sliceProfile_TN_BH_sST": "test_sliceProfile_TN_BH _sST", + "sliceProfile_TN_BH_sNSSAI":"test_tn_service_snssai_01", "tn_bh_enableNSSISelection":false, "cn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411c", "cn_suggest_nssi_name": "eMBB CNinstance3", diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.html index 00a63057..a3631983 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.html @@ -33,7 +33,7 @@ [nzStatus]="item.status" [nzIcon]="item.status === 'processing'? 'anticon anticon-spin anticon-loading' : null" > - +

No data

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 4e765055..d1add64a 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 @@ -32,7 +32,9 @@ export class SlicingTaskManagementComponent implements OnInit { } } - ngOnInit() {} + ngOnInit() { + console.log('11.24 1732') + } getTaskList(): void { const { pageNum, pageSize } = this; diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts index 93ed9ae3..f5e5ac3c 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts @@ -181,7 +181,7 @@ export class SlicingTaskModelComponent implements OnInit { 'sliceProfile_AN_logicInterfaceId', 'sliceProfile_AN_nextHopInfo' ]), an_coverage_area_ta_list: area}; - this.slicingSubnet[1].params = this.pick(nsi_nssi_info, ['tn_bh_latency', 'tn_bh_bandwidth', 'tn_bh_script_name', 'sliceProfile_TN_BH_jitte', 'sliceProfile_TN_BH _sNSSAI',"tn_bh_enableNSSISelection"]); + this.slicingSubnet[1].params = this.pick(nsi_nssi_info, ['tn_bh_latency', 'tn_bh_bandwidth', 'tn_bh_script_name', 'sliceProfile_TN_BH_jitte', 'sliceProfile_TN_BH_sNSSAI',"tn_bh_enableNSSISelection"]); this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [ 'cn_service_snssai', 'cn_resource_sharing_level', 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 e71b459f..649b5eb1 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 @@ -40,23 +40,23 @@ export class SubnetParamsModelComponent implements OnInit { ngOnChanges() { if(this.title){ - this.formData = JSON.parse(JSON.stringify(this.detailData)); - if (this.title === 'An' || this.title === 'Cn') { - this.coreFormItems = this.title === 'An'?CORE_FORM_ITEMS.An:this.title === 'Cn'?CORE_FORM_ITEMS.Cn:[]; - this.keyList = this.coreFormItems.find((item) => {return item.title === 'Endpoint'}).options.map((val) => {return val.key}); - if(this.formData !==undefined && Object.keys(this.formData).length!==0){ - this.EndpointEnable = this.keyList.every((item) => {return this.formData.hasOwnProperty(item)}) - } - if(this.EndpointEnable){ - this.EndpointInputs = this.Util.pick(this.formData, this.keyList)// no? - }else{ - this.coreFormItems.map((item,index)=>{ - if(item.title === 'Endpoint'){ - this.coreFormItems.splice(index,1) - } - }) - } - } + this.formData = JSON.parse(JSON.stringify(this.detailData)); + if (this.title === 'An' || this.title === 'Cn') { + this.coreFormItems = this.title === 'An'?CORE_FORM_ITEMS.An:this.title === 'Cn'?CORE_FORM_ITEMS.Cn:[]; + this.keyList = this.coreFormItems.find((item) => {return item.title === 'Endpoint'}).options.map((val) => {return val.key}); + if(this.formData !==undefined && Object.keys(this.formData).length!==0){ + this.EndpointEnable = this.keyList.every((item) => {return this.formData.hasOwnProperty(item)}) + } + if(this.EndpointEnable){ + this.EndpointInputs = this.Util.pick(this.formData, this.keyList)// no? + }else{ + this.coreFormItems.map((item,index)=>{ + if(item.title === 'Endpoint'){ + this.coreFormItems.splice(index,1) + } + }) + } + } } //-------> Comment: Above code diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 61030d55..951af262 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -132,7 +132,7 @@ export const BUSINESS_REQUIREMENT = [ export const TRANSFRER_FORM_ITEMS = [ { title: 'S-NSSAI', - key: 'iceProfile_TN_sNSSAI', + key: 'sliceProfile_TN_BH_sNSSAI', required: true }, { -- cgit 1.2.3-korg