feat: Modified some fields

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

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.ts
index 1babf27..6ea6139 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component.ts
@@ -61,7 +61,7 @@ export class CheckProcessModelComponent implements OnInit {
                                        return item
                                })
                                // 前端模拟数据
-                               let area = ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"].map(item => {
+                               let area = ["Beijing;Beijing City;Haidian District", "Beijing;Beijing City;Xicheng District", "Beijing;Beijing City;Changping District"].map(item => {
                                        item = item.split(';').join(' - ')
                                        return item
                                })

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 e2f2a3d..69fe7fe 100644 (file)
--- 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
@@ -134,7 +134,7 @@ export class SlicingTaskModelComponent implements OnInit {
           return item
         })  
         // 前端模拟数据
-        let areaList = ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"].map(item => {
+        let areaList = ["Beijing;Beijing City;Haidian District", "Beijing;Beijing City;Xicheng District", "Beijing;Beijing City;Changping District"].map(item => {
           item = item.split(';').join(' - ')
           return item
         })
@@ -159,7 +159,7 @@ export class SlicingTaskModelComponent implements OnInit {
         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, 0);
         // 前端模拟数据
-        let area = ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"]
+        let area = ["Beijing;Beijing City;Haidian District", "Beijing;Beijing City;Xicheng District", "Beijing;Beijing City;Changping District"]
         // this.slicingSubnet[0].params = { an_latency, an_5qi, an_coverage_area_ta_list } 
         this.slicingSubnet[0].params = { an_latency, an_5qi, an_coverage_area_ta_list:area } 
         this.slicingSubnet[1].params = { tn_latency, tn_bandwidth };

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 c7df1bf..227c182 100644 (file)
--- 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
@@ -11,7 +11,7 @@
                                </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 ? 6 : 0" class="subnet_params_area"
+                                               <nz-form-control [nzSpan]="!ind ? 4 : 5" [nzOffset]="i && !ind ? 6 : 0" class="subnet_params_area"
                                                        *ngFor="let item of area; let ind = index">
                                                        <nz-select [(ngModel)]="item.selected" [name]="'area' + i + ind"
                                                                (nzOpenChange)="handleChange(area, item)"

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index b3ce681..27b90c7 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -189,23 +189,23 @@ export const CORE_FORM_ITEMS = [
 export const ADDRESS = [\r
        {\r
                "id": "1",\r
-               "name": "北京",\r
+               "name": "Beijing",\r
                "city": [\r
                        {\r
                                "id": "101",\r
-                               "name": "北京市",\r
+                               "name": "Beijing City",\r
                                "county": [\r
                                        {\r
                                                "id": "1001",\r
-                                               "name": "海淀区",\r
+                                               "name": "Haiding District",\r
                                        },\r
                                        {\r
                                                "id": "1002",\r
-                                               "name": "西城区",\r
+                                               "name": "Xicheng District",\r
                                        },\r
                                        {\r
                                                "id": "1003",\r
-                                               "name": "昌平区"\r
+                                               "name": "Changping District"\r
                                        }\r
                                ]\r
                        }\r
@@ -213,18 +213,18 @@ export const ADDRESS = [
        },\r
        {\r
                "id": "2",\r
-               "name": "上海",\r
+               "name": "Shanghai",\r
                "city": [{\r
                        "id": "201",\r
-                       "name": "上海市",\r
+                       "name": "Shanghai City",\r
                        "county": [\r
                                {\r
                                        "id": "2001",\r
-                                       "name": "浦东新区",\r
+                                       "name": "Pudongxin District",\r
                                },\r
                                {\r
                                        "id": "2002",\r
-                                       "name": "静安区"\r
+                                       "name": "Jingan District"\r
                                }\r
                        ]\r
                }]\r