diff options
| -rw-r--r-- | usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.css | 12 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.spec.ts | 2 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.ts | 11 | ||||
| -rw-r--r-- | usecaseui-portal/src/assets/images/cloud-county1.png | bin | 3062 -> 24718 bytes | |||
| -rw-r--r-- | usecaseui-portal/src/assets/images/cloud-out.png | bin | 3364 -> 27090 bytes |
5 files changed, 17 insertions, 8 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.css b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.css index 99b58160..0347ce72 100644 --- a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.css +++ b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.css @@ -38,13 +38,17 @@ #tpContainer{ + position: relative; width:100%; - /*height: 80%;*/ + height: 95%; + margin-top: 15px; float: left; + background: #EEF9FF; } .model { + position: relative; padding: 15px; - height: 100%; + height: 100vh; width: 100%; } .model .creation { @@ -53,7 +57,9 @@ /*float: left;*/ width: 20%; position: absolute; - right: 1%; + left: 0; + margin-top: 30px; + margin-left: 30px; border-radius: 5px; box-shadow: 0 0 10px #9e9e9e; padding: 10px; diff --git a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.spec.ts b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.spec.ts index 03cc5065..9ec321c5 100644 --- a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.spec.ts +++ b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.spec.ts @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 CMCC, Inc. and others. All rights reserved. + 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. diff --git a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.ts b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.ts index 48de5636..03894ba9 100644 --- a/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.ts +++ b/usecaseui-portal/src/app/ccvpn-network/ccvpn-network.component.ts @@ -124,9 +124,9 @@ export class CcvpnNetworkComponent implements OnInit { network = []; delcloud = false; - winWidth = $('.content').width(); - winHeight = 600; - charge = -300; + winWidth = $('#tpContainer').width(); + winHeight = $('#tpContainer').height(); + charge = -300; imgmap = { '1': './assets/images/cloud-county1.png', @@ -274,7 +274,10 @@ export class CcvpnNetworkComponent implements OnInit { .attr('width', width) .attr('height', height) .attr('id', 'content-svg') - .style('pointer-events', 'all'), + .style('pointer-events', 'all') + .style('position','absolute') + .style('top','1%') + .style('right','2%'), graph = svg.append('g').attr('class', 'graph').attr('id', 'graph'), _g_nodes = graph.selectAll('g.node') diff --git a/usecaseui-portal/src/assets/images/cloud-county1.png b/usecaseui-portal/src/assets/images/cloud-county1.png Binary files differindex feb6a4a8..99b3e135 100644 --- a/usecaseui-portal/src/assets/images/cloud-county1.png +++ b/usecaseui-portal/src/assets/images/cloud-county1.png diff --git a/usecaseui-portal/src/assets/images/cloud-out.png b/usecaseui-portal/src/assets/images/cloud-out.png Binary files differindex aeec4fdd..c47d7d8e 100644 --- a/usecaseui-portal/src/assets/images/cloud-out.png +++ b/usecaseui-portal/src/assets/images/cloud-out.png |
