From c8356a715a64b92001b7c815eb1b08b908004c8d Mon Sep 17 00:00:00 2001 From: Quan-Zhong Date: Wed, 2 Nov 2016 16:04:42 +0800 Subject: fix datacenter.js NFVO-39 Change-Id: I3820e6a02be41e9f7c365e79f36edcaa518d2d52 Signed-off-by: Quan-Zhong --- .../src/main/webapp/resmgr-nfv/conf/globalconfig.json | 4 +--- .../portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js | 11 +++++------ .../portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'openo-portal/portal-resmgr') diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json index 367b974d..9df8207a 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json @@ -1,5 +1,3 @@ { - "url": "http://192.168.233.226", - "port": "80", - "context_name":"" + "url": "http://127.0.0.1:8080/resmgr" } \ No newline at end of file diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js index a861165a..3a74ce10 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js @@ -227,12 +227,11 @@ $(function () { type: "GET", url: requestUrl, contentType: "application/json", - success: function (jsonobj) { - $.each(jsonobj.data, function (n, v) { - htmlContent += ""; - $("#location").html(htmlContent); - - }); + success: function (jsonobj) {var str = jsonobj.data.replace('[', '').replace(']', '').split(',') + $.each(str, function (n, v) { + htmlContent += ""; + $("#location").html(htmlContent); + }); }, error: function (xhr, ajaxOptions, thrownError) { diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js index bf8f829c..06814d15 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js @@ -22,7 +22,7 @@ function getUrl(){ async:false, dataType:"json", success:function(jsonData) { - url = jsonData.url + ":" + jsonData.port +jsonData.context_name; + url = jsonData.url; console.log("url = " + url); } }); -- cgit 1.2.3-korg