feat: change the order of english address

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

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
index 73407ad..e286748 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
@@ -1,7 +1,7 @@
-import {Component, OnInit, Input} from '@angular/core';
-import {NzModalService} from "ng-zorro-antd";
-import {SlicingTaskServices} from '.././../../../../../core/services/slicingTaskServices';
-import {NsiModelComponent} from "../../nsi-management/nsi-model/nsi-model.component";
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalService } from "ng-zorro-antd";
+import { SlicingTaskServices } from '.././../../../../../core/services/slicingTaskServices';
+import { NsiModelComponent } from "../../nsi-management/nsi-model/nsi-model.component";
 
 @Component({
     selector: 'app-slicing-business-model',
@@ -32,34 +32,34 @@ export class SlicingBusinessModelComponent implements OnInit {
             this.isSpinning = false;
             const { result_body, result_header: { result_code } } = res;
             if (+result_code === 200) {
-                const {business_demand_info,business_demand_info: { coverage_area_ta_list },nst_info,nsi_info}  = result_body;
+                const { business_demand_info, business_demand_info: { coverage_area_ta_list }, nst_info, nsi_info } = result_body;
                 business_demand_info.area = coverage_area_ta_list.map(item => {
                     item = item.split(';').join('-');
                     return item
                 });
                 // area : Front-end analog data
-                let area = ["Beijing;Beijing;Xicheng District", "Beijing;Beijing;Haidian District", "Beijing;Beijing;Chaoyang District"].map(item => {
+                let area = ["Haidian District;Beijing;Beijing", "Xicheng District;Beijing;Beijing", "Changping District;Beijing;Beijing"].map(item => {
                     item = item.split(';').join(' - ');
                     return item
                 });
-                this.businessRequirement = [{...business_demand_info, area}];
+                this.businessRequirement = [{ ...business_demand_info, area }];
                 this.NSTinfo = [nst_info];
-                if(nsi_info.nsi_id !==null){
+                if (nsi_info.nsi_id !== null) {
                     this.nsiInfo = [nsi_info];
                 }
             }
         })
     }
     showdetail(data) {
-        console.log(data,"data.nsi_id");
+        console.log(data, "data.nsi_id");
         const nsiModal = this.modalService.create({
-            nzTitle:"Detail",
+            nzTitle: "Detail",
             nzContent: NsiModelComponent,
-            nzWidth:"70%",
+            nzWidth: "70%",
             nzOkText: null,
             nzCancelText: null,
-            nzComponentParams:{
-                nsiId:data.nsi_id
+            nzComponentParams: {
+                nsiId: data.nsi_id
             }
         });
     }

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 4b19a12..f302458 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 = ["Beijing;Beijing;Haidian District", "Beijing;Beijing;Xicheng District", "Beijing;Beijing;Changping District"].map(item => {
+        let areaList = ["Haidian District;Beijing;Beijing", "Xicheng District;Beijing;Beijing", "Changping District;Beijing;Beijing"].map(item => {
           item = item.split(';').join(' - ')
           return item
         })