From 510efe24bd92616d621f47650b64110f71776cb2 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Mon, 20 May 2019 10:00:59 +0800
Subject: Package management interface

Change-Id: I178924275f5ffe6a54d0b7a7efa99b6f8532843e
Issue-ID: USECASEUI-211
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 .../src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html  | 3 +++
 .../src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.less  | 7 +++++++
 .../src/app/services/services-list/services-list.component.ts      | 6 ++++--
 usecaseui-portal/src/assets/i18n/cn.json                           | 1 +
 usecaseui-portal/src/assets/i18n/en.json                           | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html
index 31307abf..81b77fbb 100644
--- a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html
+++ b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html
@@ -35,6 +35,7 @@
                 <div class="listlin"></div>
                 <div class="listfile">
                     <div style="color: rgba(66,84,143,1);font-family:ArialMT;padding-bottom: 15px;height: 15%"> {{"i18nTextDefine_Uploaded_files" | translate}} </div>
+                    <div class="nouploadfile">{{"i18nTextDefine_Nofileuploading" | translate}}</div>
                     <div style="height:80%;overflow: auto">
                         <div class="listfilebgc" *ngFor="let itemns of nsRightList">
                             <div>
@@ -145,6 +146,7 @@
             <div class="listlin"></div>
             <div class="listfile">
                 <div style="color: rgba(66,84,143,1);font-family:ArialMT;padding-bottom: 15px;height: 15%"> {{"i18nTextDefine_Uploaded_files" | translate}} </div>
+                <div class="nouploadfile">{{"i18nTextDefine_Nofileuploading" | translate}}</div>
                 <div style="height:80%;overflow: auto">
                     <div class="listfilebgc" *ngFor="let itemns of vnfRightList">
                         <div>
@@ -242,6 +244,7 @@
             <div class="listlin"></div>
             <div class="listfile">
                 <div style="color: rgba(66,84,143,1);font-family:ArialMT;padding-bottom: 15px;height: 15%"> {{"i18nTextDefine_Uploaded_files" | translate}} </div>
+                <div class="nouploadfile">{{"i18nTextDefine_Nofileuploading" | translate}}</div>
                 <div style="height:80%;overflow: auto">
                     <div class="listfilebgc" *ngFor="let itemns of pnfRightList">
                         <div>
diff --git a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.less b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.less
index 593597dc..c31409c9 100644
--- a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.less
+++ b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.less
@@ -81,6 +81,13 @@ hr {
         vertical-align: top;
         display: inline-block;
         margin-left: 10%;
+        .nouploadfile{
+            height: 80%;
+            width: 100%;
+            text-align: center;
+            font-size: 22px;
+            margin-top: 5%;
+        }
         .listfilebgc { 
         background-color: #fff;
         border-bottom: 8px solid #F7F8FC;
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
index fb110626..d9b1656e 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
@@ -850,7 +850,9 @@ e2eCloseCreate(obj,templateCreatestarting,templateCreateSuccessFaild) {
         console.log(data);
         newData.rate = 100;
         newData.status = "Successful";
-	this.createSuccessNotification(templateCreateSuccessFaild);
+        this.thisCreateService = newData;
+        console.log(this.thisCreateService)
+	    this.createSuccessNotification(templateCreateSuccessFaild);
                     newData.tips = this.listSortMasters["operationTypes"].find((its) => {
                         return its["sortCode"] == newData["statusClass"] && its["language"] == this.language
                     })["sortValue"] + '\xa0\xa0\xa0' + this.listSortMasters["operationResults"].find((its) => {
@@ -1071,6 +1073,7 @@ e2eCloseCreate(obj,templateCreatestarting,templateCreateSuccessFaild) {
     this.stopNsService(id,requestBody).then((jobid)=>{
       if(jobid == "Failed"){
         service.status = "Failed";
+          this.deleteSuccessNotification(templateDeleteSuccessFaild);
                 service.tips = this.listSortMasters["operationTypes"].find((its)=>{ return its["sortCode"]==service.statusClass && its["language"]==this.language})["sortValue"] + this.listSortMasters["operationResults"].find((its) => {
                     return its["sortCode"] == 2002 && its["language"] == this.language
                 })["sortValue"];
@@ -1106,7 +1109,6 @@ e2eCloseCreate(obj,templateCreatestarting,templateCreateSuccessFaild) {
           }
                     console.log(service,"deleteservice");
                     console.log(this.thisService,"thisService");
-                    this.deleteSuccessNotification(templateDeleteSuccessFaild);
           let hasUndone = this.tableData.some((item)=>{
             return item.rate < 100;
           })
diff --git a/usecaseui-portal/src/assets/i18n/cn.json b/usecaseui-portal/src/assets/i18n/cn.json
index 1edb2f93..f1dcc066 100644
--- a/usecaseui-portal/src/assets/i18n/cn.json
+++ b/usecaseui-portal/src/assets/i18n/cn.json
@@ -99,6 +99,7 @@
   "i18nTextDefine_Uploaded_files":"已上传文件",
   "i18nTextDefine_Uploading":"上传中",
   "i18nTextDefine_StartUpload":"开始上传",
+  "i18nTextDefine_Nofileuploading":"没有文件正在上传。",
   "i18nTextDefine_File_upload_completed":"文件上传完毕",
   "i18nTextDefine_File_upload_failed":"文件上传失败",
   "i18nTextDefine_Version":"版本",
diff --git a/usecaseui-portal/src/assets/i18n/en.json b/usecaseui-portal/src/assets/i18n/en.json
index 5909e151..5b5626e5 100644
--- a/usecaseui-portal/src/assets/i18n/en.json
+++ b/usecaseui-portal/src/assets/i18n/en.json
@@ -99,6 +99,7 @@
   "i18nTextDefine_Uploaded_files":"Uploaded files",
   "i18nTextDefine_Uploading":"Uploading",
   "i18nTextDefine_StartUpload":"StartUpload",
+  "i18nTextDefine_Nofileuploading":"No file is uploading.",
   "i18nTextDefine_File_upload_completed":"File upload completed",
   "i18nTextDefine_File_upload_failed":"File upload failed",
   "i18nTextDefine_Version":"Version",
-- 
cgit 1.2.3-korg