feat: Encapsulates the common parameter dialog components and completes the initial... 92/98992/1
authorcyuamber <xuranyjy@chinamobile.com>
Mon, 2 Dec 2019 07:38:13 +0000 (15:38 +0800)
committercyuamber <xuranyjy@chinamobile.com>
Mon, 2 Dec 2019 07:38:22 +0000 (15:38 +0800)
Change-Id: I11b6e8f5c21345c7eb7f31c4101f7db424e7a525
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts
usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html
usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.less
usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts
usecaseui-portal/src/constants/constants.ts

index 6956831..0682c16 100644 (file)
@@ -16,7 +16,7 @@
             "ue_mobility_level": "stageary",\r
             "latency": "20",\r
             "use_interval": "12",\r
-            "coverage_area_ta_list": [" xxxx;xxxxx;xxxxx ", " xxxx;xxxxx;xxxxx ", " xxxx;xxxxx;xxxxx "],\r
+            "coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"],\r
             "activity_factor": "60",\r
             "resource_sharing_level": "shared",\r
             "area_traffic_cap_ul": "300",\r
@@ -34,7 +34,7 @@
             "an_suggest_nssi_name": "eMBB ANinstance1",\r
             "an_latency": "10",\r
             "an_5qi": "8",\r
-            "an_coverage_area_ta_list": [" xxxx;xxxxx;xxxxx ", " xxxx;xxxxx;xxxxx ", " xxxx;xxxxx;xxxxx "],\r
+            "an_coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"],\r
             "tn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411a",\r
             "tn_suggest_nssi_name": "eMBB TNinstance1",\r
             "tn_latency": "10",\r
index b9c7827..5e6fd98 100644 (file)
@@ -109,14 +109,10 @@ export class SlicingTaskModelComponent implements OnInit {
           service_instance_name: this.selectedServiceName
         }];
         // 子网实例
-       
         let subnetData = { an_suggest_nssi_id, an_suggest_nssi_name, tn_suggest_nssi_id, tn_suggest_nssi_name, cn_suggest_nssi_id, cn_suggest_nssi_name};
         this.subnetDataFormatting(subnetData);
         this.slicingSubnet[0].params = { an_latency, an_5qi, an_coverage_area_ta_list } 
-       
         this.slicingSubnet[1].params = { tn_latency, tn_bandwidth };
-
-       
         this.slicingSubnet[2].params = { 
           cn_service_snssai,
           cn_resource_sharing_level,
index 04042d7..4d8e54b 100644 (file)
@@ -1,2 +1,42 @@
-<nz-modal [(nzVisible)]="showModel" [nzTitle]="title" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" nzWidth="750px">
+<nz-modal [(nzVisible)]="showModel" [nzTitle]="title + '参数'" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" nzWidth="700px">
+    <div class="subnet_params_container">
+        <form nz-form *ngIf="title === '无线域'">
+            <nz-form-item *ngFor="let item of wirelessFormItems">
+                <nz-form-label  [nzSpan]="5" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
+                <nz-form-control [nzSpan]="10"  *ngIf="item.key !== 'an_coverage_area_ta_list'">
+                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key"/>
+                </nz-form-control>
+                <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-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>
+                    </div>
+                    
+                </div>
+            </nz-form-item>
+        </form>
+        <form nz-form *ngIf="title === '传输域'">
+            <nz-form-item *ngFor="let item of transferFormItems">
+                <nz-form-label  [nzSpan]="7" nzRequired [nzFor]="item.key">{{item.title}}</nz-form-label>
+                <nz-form-control [nzSpan]="12">
+                    <input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key"/>
+                </nz-form-control>
+            </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>
+
+    </div>
 </nz-modal>
index e69de29..814d2f0 100644 (file)
@@ -0,0 +1,19 @@
+.subnet_params_container{\r
+    padding-left: 3%;\r
+    .subnet_params_area{\r
+        margin-right: 5px;\r
+    }\r
+    .ant-btn-icon-only{\r
+        padding: 0 5px !important;\r
+    }\r
+    .subnet_params_button{\r
+        margin-top: 7px;\r
+        margin-left: 10px;\r
+    }\r
+    .subnet_params_icon{\r
+        font-size: 14px;\r
+    }\r
+}\r
+.ant-form-item-label {\r
+    text-align: left;\r
+}
\ No newline at end of file
index ec8790a..1a3a194 100644 (file)
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS } from '../.../../../../../../../../constants/constants'
+import { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS } from '../.../../../../../../../../constants/constants'
 
 @Component({
        selector: 'app-subnet-params-model',
@@ -14,11 +14,36 @@ export class SubnetParamsModelComponent implements OnInit {
        @Output() cancel = new EventEmitter<boolean>();
 
        transferFormItems = TRANSFRER_FORM_ITEMS;
+       coreFormItems = CORE_FORM_ITEMS;
+       wirelessFormItems = WIRELESS_FORM_ITEMS;
+       areaList: any[] = [];
 
        constructor() { }
 
-       ngOnInit() {
+       ngOnInit() { }
 
+       ngOnChanges() {
+               if (this.title === '无线域') {
+                       this.AreaFormatting();
+               }
+       }
+
+       AreaFormatting () {
+               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 = {};
+                               obj.selected = ite
+                               obj.options = [{name: ite, id: ite}]
+                               return obj
+                       })
+                       return item;
+               })
+       }
+
+       creatAreaList () {
+               
        }
 
        handleCancel() {
index 6f9c48c..b9e4ac8 100644 (file)
@@ -95,5 +95,191 @@ export const TRANSFRER_FORM_ITEMS = [
        {\r
                title: '带宽',\r
                key: 'tn_bandwidth'\r
+       }\r
+]\r
+\r
+export const CORE_FORM_ITEMS =         [\r
+       {\r
+               title: 'S-NSSAI',\r
+               key: 'cn_service_snssai'\r
+       },\r
+       {\r
+               title: '共享等级',\r
+               key: 'cn_resource_sharing_level'\r
+       },\r
+       {\r
+               title: '游牧性',\r
+               key: 'cn_ue_mobility_level'\r
+       },\r
+       {\r
+               title: '时延(ms)',\r
+               key: 'cn_latency'\r
+       },\r
+       {\r
+               title: '连接规模数',\r
+               key: 'cn_max_number_of_ues'\r
+       },\r
+       {\r
+               title: '活动因子(%)',\r
+               key: 'cn_activity_factor'\r
+       },\r
+       {\r
+               title: '用户下行体验速率(Mbps)',\r
+               key: 'cn_exp_data_rate_dl'\r
+       },\r
+       {\r
+               title: '用户上行体验速率(Mbps)',\r
+               key: 'cn_exp_data_rate_ul'\r
        },\r
+       {\r
+               title: '下行区域流量密度(Mbps/km )',\r
+               key: 'cn_area_traffic_cap_dl'\r
+       },\r
+       {\r
+               title: '下行区域流量密度(Mbps/km )',\r
+               key: 'cn_area_traffic_cap_ul'\r
+       }\r
 ]\r
+\r
+export const ADDRESS = {\r
+    "result_header": {\r
+        "result_code": 200,\r
+        "result_message": "Successfully"\r
+    },\r
+    \r
+    "result_body": {\r
+        "province": [\r
+            {\r
+                "id": "1",\r
+                "name": "北京",\r
+                "city": [\r
+                    {\r
+                        "id": "101",\r
+                        "name": "北京市",\r
+                        "county": [\r
+                            {\r
+                                "id": "1001",\r
+                                "name": "海淀区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100101",\r
+                                        "name": "万寿路街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100102",\r
+                                        "name": "中关村街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100103",\r
+                                        "name": "海淀街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100104",\r
+                                        "name": "西三旗街道"\r
+                                    }\r
+                                ]\r
+                            },\r
+                            {\r
+                                "id": "1002",\r
+                                "name": "西城区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100201",\r
+                                        "name": "广安门内街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100202",\r
+                                        "name": "广安门外街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100203",\r
+                                        "name": "西长安街街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100204",\r
+                                        "name": "金融街街道"\r
+                                    }\r
+                                ]\r
+                            },\r
+                            {\r
+                                "id": "1003",\r
+                                "name": "昌平区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100301",\r
+                                        "name": "城北街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100302",\r
+                                        "name": "城南街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100303",\r
+                                        "name": "天通苑北街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100304",\r
+                                        "name": "天通苑南街道"\r
+                                    }\r
+                                ]\r
+                            }\r
+                        ]\r
+                    }\r
+                ]\r
+            },\r
+            {\r
+                "id": "2",\r
+                "name": "上海",\r
+                "city": [{\r
+                    "id": "201",\r
+                    "name": "上海市",\r
+                    "county": [{\r
+                            "id": "2001",\r
+                            "name": "浦东新区",\r
+                            "street": [\r
+                                {\r
+                                    "id": "200101",\r
+                                    "name": "陆家嘴街道"\r
+                                },\r
+                                {\r
+                                    "id": "200102",\r
+                                    "name": "周家渡街道"\r
+                                },\r
+                                {\r
+                                    "id": "200103",\r
+                                    "name": "塘桥街道"\r
+                                },\r
+                                {\r
+                                    "id": "200104",\r
+                                    "name": "南码头路街道"\r
+                                }\r
+                            ]\r
+                        },\r
+                        {\r
+                            "id": "2002",\r
+                            "name": "静安区",\r
+                            "street": [\r
+                                {\r
+                                    "id": "200201",\r
+                                    "name": "江宁路街道"\r
+                                },\r
+                                {\r
+                                    "id": "200202",\r
+                                    "name": "静安寺街道"\r
+                                },\r
+                                {\r
+                                    "id": "200203",\r
+                                    "name": "南京西路街道"\r
+                                },\r
+                                {\r
+                                    "id": "200204",\r
+                                    "name": "曹家渡街道"\r
+                                }\r
+                            ]\r
+                        }\r
+                    ]\r
+                }]\r
+            }\r
+        ]\r
+    }\r
+}
\ No newline at end of file