feat: Completed the submit function in the task processing dialog

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

6 files changed, 166 insertions, 26 deletions

diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index fffa5801..44d87cc5 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -28,6 +28,7 @@ export class SlicingTaskServices {
         slicingInstance: this.baseUrl + '/resource/nsi/instances/pageNo/{pageNo}/pageSize/{pageSize}',

         slicingSubnetInstance: this.baseUrl + '/resource/nsi/{nsiId}/nssiInstances',

         subnetInContext: this.baseUrl + '/resource/nssi/{environmentContext}/instances/pageNo/{pageNo}/pageSize/{pageSize}',

+        submitSlicing: this.baseUrl + '/task/auditInfo',    

         //slicing-business-management

         slicingBusinessList:this.baseUrl+"/resource/business/pageNo/{pageNo}/pageSize/{pageSize}",

         slicingBusinesQueryOfStatus:this.baseUrl+"/resource/{businessStatus}/business/pageNo/{pageNo}/pageSize/{pageSize}",

@@ -76,6 +77,9 @@ export class SlicingTaskServices {
                         .replace('{pageSize}', pageSize);

         return this.http.get<any>(url);

     }

+    submitSlicing (reqbody) {

+        return this.http.put<any>(this.url.submitSlicing, reqbody)

+    }

 

     // Get slicing business list

     getSlicingBusinessList (paramsObj,isSelect: boolean) {

diff --git a/usecaseui-portal/src/app/mock/json/PUT_task_auditInfo.json b/usecaseui-portal/src/app/mock/json/PUT_task_auditInfo.json
new file mode 100644
index 00000000..75555639
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/PUT_task_auditInfo.json
@@ -0,0 +1,7 @@
+{

+    "result_header": {

+        "result_code": "200",

+        "result_message": "Operation result message."

+    },

+    "result_body": {}

+}
\ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
index e2c5561e..6c2560ac 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.html
@@ -99,7 +99,13 @@
       </nz-list-item>
     </nz-list>
   </div>
-  <app-subnet-params-model [showModel]="isShowParams" [detailData]="params" [title]="paramsTitle"
-    (cancel)="isShowParams=$event"></app-subnet-params-model>
+  <app-subnet-params-model 
+    [showModel]="isShowParams" 
+    [detailData]="params" 
+    [title]="paramsTitle" 
+    (cancel)="isShowParams=$event" 
+    (paramsDataChange)="changeParams($event)"
+  >
+  </app-subnet-params-model>
 
 </nz-modal>
\ No newline at end of file
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 5e6fd988..d9c1ec34 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
@@ -18,9 +18,9 @@ export class SlicingTaskModelComponent implements OnInit {
   // 业务需求列表
   businessList: object[] = BUSINESS_REQUIREMENT;
   // 配置审核详情
-  checkDetail: object[] = [{}];
+  checkDetail: any[] = [{}];
   //业务需求信息
-  businessRequirement: object[] = [{}];
+  businessRequirement: any[] = [];
   //匹配NST信息 
   NSTinfo: object[] = [{}];
   // 共享切片实例
@@ -70,7 +70,15 @@ export class SlicingTaskModelComponent implements OnInit {
     this.http.getAuditInfo(this.taskId).subscribe( res => {
       const { result_header: { result_code } } = res;
       if (+result_code === 200) {
-        const { task_id, task_name, create_timer, processing_status, business_demand_info, nst_info, nsi_nssi_info, business_demand_info: { service_snssai } } = res.result_body;
+        const { 
+          task_id, 
+          task_name, 
+          create_time, 
+          processing_status, 
+          business_demand_info, 
+          nst_info, nsi_nssi_info, 
+          business_demand_info: { service_snssai } 
+        } = res.result_body;
         const { 
           suggest_nsi_id, 
           suggest_nsi_name, 
@@ -97,9 +105,10 @@ export class SlicingTaskModelComponent implements OnInit {
           cn_area_traffic_cap_ul
         } = nsi_nssi_info;
         // 处理配置审核详情数据
-        this.checkDetail = [{ task_id, task_name, create_timer, processing_status, service_snssai }];
+        this.checkDetail = [{ task_id, task_name, create_time, processing_status, service_snssai }];
         // 业务需求信息数据
         this.businessRequirement = [business_demand_info];
+        // 匹配NST信息
         this.NSTinfo = [nst_info];
         // 共享切片实例
         this.selectedServiceId = suggest_nsi_id;
@@ -216,7 +225,6 @@ export class SlicingTaskModelComponent implements OnInit {
   }
 
   restSubnetInstance (instance: any): void {
-    if (!this.isDisabled) return;
     instance.slicingId = '';
     instance.slicingName = '';
   }
@@ -227,13 +235,38 @@ export class SlicingTaskModelComponent implements OnInit {
     this.params = item.params
   }
 
+  changeParams (params: any): void {
+    const index = this.paramsTitle === '无线域' ? 0 : (this.paramsTitle === '传输域' ? 1 : 2);
+    this.slicingSubnet[index].params = params
+  }
+
   handleCancel() {
     this.showDetail = false;
     this.cancel.emit(this.showDetail);
   }
   handleOk() {
-    this.handleCancel();
-    // 对应操作逻辑未编写
-
+    const { selectedServiceId, selectedServiceName, slicingSubnet, checkDetail, businessRequirement, NSTinfo } = this;
+    const nsi_nssi_info: object = {
+      suggest_nsi_id:  selectedServiceId,
+      suggest_nsi_name: selectedServiceName,
+      an_suggest_nssi_id: slicingSubnet[0].slicingId,
+      an_suggest_nssi_name: slicingSubnet[0].slicingName,
+      ...slicingSubnet[0].params,
+      tn_suggest_nssi_id: slicingSubnet[1].slicingId,
+      tn_suggest_nssi_name: slicingSubnet[1].slicingName,
+      ...slicingSubnet[1].params,
+      cn_suggest_nssi_id: slicingSubnet[2].slicingId,
+      cn_suggest_nssi_name: slicingSubnet[2].slicingName,
+      ...slicingSubnet[2].params,
+    }
+    let reqBody = {...checkDetail[0], business_demand_info: businessRequirement[0], nst_info: NSTinfo[0], nsi_nssi_info};
+    delete reqBody.service_snssai;
+    this.http.submitSlicing(reqBody).subscribe (res => {
+      const { result_header: { result_code } } = res;
+      if (+result_code === 200) {
+        console.log('成功提交')
+        this.handleCancel();
+      }
+    })
   }
 }
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 4d8e54b2..1dfc6338 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
@@ -9,13 +9,18 @@
                 <div *ngIf="item.key === 'an_coverage_area_ta_list'">
                     <div *ngFor="let area of areaList; let i = index">
                         <nz-form-control [nzSpan]="4" [nzOffset]=" i && !ind ? 5 : 0"  class="subnet_params_area" *ngFor="let item of area; let ind = index">
-                            <nz-select [(ngModel)]="item.selected" [name]="'areaList'+i+'_'+ind"> 
+                            <nz-select [(ngModel)]="item.selected" [name]="'area' +i + ind" (nzOpenChange)="handleChange(area, item)" (ngModelChange)="handleChangeSelected(area,item)"> 
                                 <nz-option [nzValue]="op.name" *ngFor="let op of item.options" [nzLabel]="op.name" ></nz-option>
                             </nz-select>
                         </nz-form-control>
-                        <button nz-button nzType="primary" nzSize="small" *ngIf="!i && !ind" class="subnet_params_button" (click)="creatAreaList()">
-                            <i nz-icon class="anticon anticon-plus subnet_params_icon"></i>
-                        </button>
+                        <nz-form-control [nzSpan]="1" [nzOffset]="1">
+                            <button nz-button nzType="primary" nzSize="small"  class="subnet_params_button"  *ngIf="!i" (click)="creatAreaList()">
+                                <i nz-icon class="anticon anticon-plus subnet_params_icon"></i>
+                            </button>
+                            <button nz-button nzType="primary" nzSize="small"  class="subnet_params_button"  *ngIf="i" (click)="deleteAreaList(i)">
+                                <i nz-icon class="anticon anticon-minus subnet_params_icon"></i>
+                            </button>
+                        </nz-form-control>
                     </div>
                     
                 </div>
@@ -30,13 +35,20 @@
             </nz-form-item>
         </form>
         <form nz-form *ngIf="title === '核心域'">
-                <nz-form-item *ngFor="let item of coreFormItems">
-                    <nz-form-label  [nzSpan]="10" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
-                    <nz-form-control [nzSpan]="10">
-                        <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key"/>
-                    </nz-form-control>
-                </nz-form-item>
-            </form>
+            <nz-form-item *ngFor="let item of coreFormItems">
+                <nz-form-label  [nzSpan]="10" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
+                <nz-form-control [nzSpan]="10" >
+                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key" [readOnly]="item.title === 'S-NSSAI'" *ngIf="item.title !== '共享等级' && item.title !== '游牧性'"/>
+                    <nz-radio-group [name]="item.key" [(ngModel)]="detailData[item.key]" *ngIf="item.title === '共享等级'">
+                        <label nz-radio [nzValue]="option.key" *ngFor="let option of item.options">{{option.title}}</label>
+                    </nz-radio-group>
+                    <nz-select [name]="item.key" [(ngModel)]="detailData[item.key]" *ngIf=" item.title === '游牧性'">
+                        <nz-option [nzValue]="option.key" *ngFor="let option of item.options" [nzLabel]="option.title"></nz-option>
+                    </nz-select>
+                </nz-form-control>
+
+            </nz-form-item>
+        </form>
 
     </div>
 </nz-modal>
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 1a3a194e..92c50d15 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
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS } from '../.../../../../../../../../constants/constants'
+import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '../.../../../../../../../../constants/constants'
 
 @Component({
 	selector: 'app-subnet-params-model',
@@ -12,6 +12,7 @@ export class SubnetParamsModelComponent implements OnInit {
 	@Input() detailData: any;
 	@Input() title: string;
 	@Output() cancel = new EventEmitter<boolean>();
+	@Output() paramsDataChange = new EventEmitter<any>();
 
 	transferFormItems = TRANSFRER_FORM_ITEMS;
 	coreFormItems = CORE_FORM_ITEMS;
@@ -32,8 +33,17 @@ export class SubnetParamsModelComponent implements OnInit {
 		let areaList = [...this.detailData.an_coverage_area_ta_list];
 		this.areaList = areaList.map ( (item: any) => {
 			let arr = item.split(';');
-			item = arr.map( ite => {
-				let obj: any = {};
+			item = arr.map( (ite, index) => {
+				let key: string;
+				if (!index) {
+					key = 'province';
+				} else if (index === 1){
+					key = 'city'
+				} else {
+					key = 'district'
+				}
+				const obj: any = {};
+				obj.key = key;
 				obj.selected = ite
 				obj.options = [{name: ite, id: ite}]
 				return obj
@@ -42,8 +52,61 @@ export class SubnetParamsModelComponent implements OnInit {
 		})
 	}
 
-	creatAreaList () {
-		
+	creatAreaList (): void {
+		let arr = [
+			{
+				key: 'province',
+				selected: '',
+				options: []
+			},
+			{
+				key: 'city',
+				selected: '',
+				options: []
+			},
+			{
+				key: 'district',
+				selected: '',
+				options: []
+			}
+		]
+		this.areaList.push(arr)
+	}
+
+	deleteAreaList (index: number): void {
+		this.areaList.splice(index,1);
+	}
+
+	handleChange(area: any[], areaItem: any): void{
+		if (areaItem.key === 'province' && areaItem.options.length <= 1) {
+			areaItem.options = ADDRESS;
+		} else if (areaItem.key === 'city' && areaItem.options.length <= 1) {
+			ADDRESS.forEach( item => {
+				if(item.name === area[0].selected) {
+					areaItem.options = item.city;
+				}
+			})
+		}else if (areaItem.key === 'district' && areaItem.options.length <= 1) {
+			ADDRESS.forEach( (item: any) => {
+				item.city.forEach(city => {
+					if (city.name === area[1].selected) {
+						areaItem.options = city.county;
+					}
+				})
+			})
+		}
+	}
+
+	handleChangeSelected(area: any[], areaItem: any) {
+		if (areaItem.key === 'province') {
+			area[1].selected = ''
+			area[1].options = [];
+			area[2].selected = '';
+			area[2].options = [];
+		} else if (areaItem.key === 'city') {
+			area[2].selected = '';
+			area[2].options = [];
+		}
 	}
 
 	handleCancel() {
@@ -52,6 +115,21 @@ export class SubnetParamsModelComponent implements OnInit {
 	}
 
 	handleOk(): void {
+		let params: object;
+		if (this.title === '无线域') {
+			const an_coverage_area_ta_list: string[] = [];
+			this.areaList.forEach( item => {
+				let str: string = '';
+				item.forEach( area => {
+					str += area.selected + ';';
+				})
+				an_coverage_area_ta_list.push(str.substring(0, str.length-1));
+			})
+			params = {...this.detailData, an_coverage_area_ta_list}
+		} else {
+			params = {...this.detailData}
+		}
+		this.paramsDataChange.emit(params)
 		this.handleCancel()
 	}