From 65dc3779955639f8ba5550e6e5f419440fc0e658 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Mon, 23 Dec 2019 15:18:57 +0800
Subject: feat: Modified some fields

Change-Id: Ie55deb45391e20ddb1db38e221b377f177edb214
Issue-ID: USECASEUI-368
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../check-process-model.component.ts                   |  2 +-
 .../slicing-task-model/slicing-task-model.component.ts |  4 ++--
 .../subnet-params-model.component.html                 |  2 +-
 usecaseui-portal/src/constants/constants.ts            | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'usecaseui-portal')

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 1babf278..6ea61397 100644
--- 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 e2f2a3da..69fe7fe1 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
@@ -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 c7df1bf1..227c182a 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
@@ -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 b3ce6811..27b90c7f 100644
--- 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 = [
 	{
 		"id": "1",
-		"name": "北京",
+		"name": "Beijing",
 		"city": [
 			{
 				"id": "101",
-				"name": "北京市",
+				"name": "Beijing City",
 				"county": [
 					{
 						"id": "1001",
-						"name": "海淀区",
+						"name": "Haiding District",
 					},
 					{
 						"id": "1002",
-						"name": "西城区",
+						"name": "Xicheng District",
 					},
 					{
 						"id": "1003",
-						"name": "昌平区"
+						"name": "Changping District"
 					}
 				]
 			}
@@ -213,18 +213,18 @@ export const ADDRESS = [
 	},
 	{
 		"id": "2",
-		"name": "上海",
+		"name": "Shanghai",
 		"city": [{
 			"id": "201",
-			"name": "上海市",
+			"name": "Shanghai City",
 			"county": [
 				{
 					"id": "2001",
-					"name": "浦东新区",
+					"name": "Pudongxin District",
 				},
 				{
 					"id": "2002",
-					"name": "静安区"
+					"name": "Jingan District"
 				}
 			]
 		}]
-- 
cgit 1.2.3-korg