From 8ca667af29ce93f5b801ccfafbf6d14e55640300 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Thu, 21 Mar 2019 19:51:39 +0800 Subject: Dashboard Interface Function Modification Change-Id: Ia3ebdfaa0dd3acde1e626ed500341e0d4ae72142 Issue-ID: USECASEUI-214 Signed-off-by: guochuyicmri --- .../onboard-vnf-vm/onboard-vnf-vm.component.html | 103 +++++++++++---------- .../onboard-vnf-vm/onboard-vnf-vm.component.less | 26 +++++- .../onboard-vnf-vm/onboard-vnf-vm.component.ts | 29 ++++-- 3 files changed, 96 insertions(+), 62 deletions(-) (limited to 'usecaseui-portal/src/app/services') 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 605c455f..b4812924 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 @@ -1,5 +1,5 @@
-
- -

- -

-

Click or drag CSAR File here

-

- - -
-
-
-
-
Uploaded files
-
-
111
-
pnf-test.csar
-
- +
+
+ +

+ +

+

Click or drag CSAR File here

+

+ + +
+
+
+
+
Uploaded files
+
+
111
+
pnf-test.csar
+
+ +
+
456
-
456
-
-
-
111
-
pnf-test.csar
-
- +
+
111
+
pnf-test.csar
+
+ +
+
456
+
+
+
111
+
pnf-test.csar
+
File upload completed
+
456
+
+
+
111
+
pnf-test.csar
+
File upload completed
+
456
+
+
+
111
+
pnf-test.csar
+
File upload completed
+
456
-
456
-
-
-
111
-
pnf-test.csar
-
File upload completed
-
456
-
-
-
111
-
pnf-test.csar
-
File upload completed
-
456
-
-
-
111
-
pnf-test.csar
-
File upload completed
-
456
-
@@ -136,7 +137,7 @@ 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 b4d92fde..b973e575 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 @@ -1,3 +1,18 @@ +/* + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ .title { font: 700 18px/18px "思源黑体"; color: #4c5e70; @@ -47,11 +62,13 @@ hr { // padding: 10px; .listupload { width: 22%; - float: left; + vertical-align: top; + display: inline-block; margin-left: 13%; } .listlin { - float: left; + vertical-align: top; + display: inline-block; width: 1%; margin-left: 10%; height: 177px; @@ -59,8 +76,9 @@ hr { border-right: 2px solid #EEEEEE; } .listfile { - float: left; - width: 44%; + width: 43%; + vertical-align: top; + display: inline-block; margin-left: 10%; .listfilebgc { background-color: #fff; diff --git a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts index 95977823..a35de356 100644 --- a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts +++ b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts @@ -1,3 +1,18 @@ +/* + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http'; import { Component, OnInit, HostBinding } from '@angular/core'; // import { MyhttpService } from '../../myhttp.service'; @@ -37,13 +52,13 @@ export class OnboardVnfVmComponent implements OnInit { //url url = { // line up - //ns: '/api/nsd/v1/ns_descriptors/'+this.nsdInfoId +'/nsd_content', - //vnf: '/api/vnfpkgm/v1/vnf_packages/'+this.vnfPkgId+'/package_content', - //pnf: '/api/nsd/v1/pnf_descriptors/'+this.pnfdInfoId+'/pnfd_content' - // 本地 - ns: 'https://jsonplaceholder.typicode.com/posts/', - vnf: 'https://jsonplaceholder.typicode.com/posts/', - pnf: 'https://jsonplaceholder.typicode.com/posts/', + ns: '/api/nsd/v1/ns_descriptors/'+this.nsdInfoId +'/nsd_content', + vnf: '/api/vnfpkgm/v1/vnf_packages/'+this.vnfPkgId+'/package_content', + pnf: '/api/nsd/v1/pnf_descriptors/'+this.pnfdInfoId+'/pnfd_content' + // line local + //ns: 'https://jsonplaceholder.typicode.com/posts/', + //vnf: 'https://jsonplaceholder.typicode.com/posts/', + //pnf: 'https://jsonplaceholder.typicode.com/posts/', }; constructor(private myhttp: onboardService, private http: HttpClient, private msg: NzMessageService,private titleService: Title,private modal: NzModalService, private modalService: NzModalService) { } -- cgit 1.2.3-korg