Merge "Fix E2E Service Instantiation bugs"

2 files changed, 2 insertions, 2 deletions

diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
index a2343d7f..4dd3f5c2 100644
--- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
+++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
@@ -424,7 +424,7 @@ export class CcvpnCreationComponent implements OnInit {
   // 提交创建数据
   submit(){   
     let globalCustomerId = this.createParams.commonParams.customer.id;
-    let globalServiceType = this.createParams.commonParams.serviceType;
+    let globalServiceType = this.createParams.commonParams.serviceType.name;
     let sotnInputs = {}; 
     // 由于请求模板不一样，所以外层需要循环请求回来的真实名字，内层循环本地参数，将当前值赋给真实名字
     this.sotnNames.forEach((name)=>{
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
index f478c699..02d6229b 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
@@ -169,7 +169,7 @@ export class E2eCreationComponent implements OnInit {
         this.service.parameters.resources.push(nsService);
       })
 
-      this.e2eCloseCreate.emit(this.service); 
+      this.e2eCloseCreate.emit({service:this.service}); 
 
     }else if(type == "ns"){
       //create ns instance