diff options
| author |   Luji7 <lu.ji3@zte.com.cn> | 2016-11-04 10:25:10 +0800 |
|---|---|---|
| committer | Luji7 <lu.ji3@zte.com.cn> | 2016-11-04 10:25:10 +0800 |
| commit | cf298fc4149e52135d5a712b345ac206abfc88cb (patch) | |
| tree | 41c9e479aff0fdd1f243e14e7a3b683d0e8720f0 /openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html | |
| parent | 140ae02914dbe36648c0d4e4c85b670f558b66b5 (diff) | |
Issue ID: GSO-60 merge changes from sun release
Change-Id: I9949e242644711a07a8da7a22dfbaf19ee7d74bd
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Diffstat (limited to 'openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html')
| -rw-r--r-- | openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html index ef181ec6..6d8b545e 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html @@ -95,18 +95,11 @@ <script type="text/javascript">
$(document).ready(function () {
- var params = new URLSearchParams(window.location.search.slice(1));
- var serviceId = params.get("serviceId");
- var jsondata = loadUnderlayData(serviceId);
- var tabData = [];
- var tableRow = {};
- tableRow.name = jsondata.name;
- tableRow.desc= jsondata.description;
- tableRow.state= jsondata.operStatus;//TODO
- tabData[0] = tableRow;
- $('#sai').bootstrapTable({
+
+ var jsondata = loadUnderlayData();
+ $('#tbl_overlay').bootstrapTable({
//Assigning data to table
- data: tabData
+ data: jsondata
});
$('#underlayTpDataTable').bootstrapTable({
//Assigning data to table
@@ -128,8 +121,10 @@ });
});
+
+ var serviceId = getQueryStringValue("serviceId");
console.log("underlayvpn - serviceId : " + serviceId);
- $("#underlay_tp").attr('data', 'UnderLay_TP.html?jsondata='+JSON.stringify(jsondata));
+
});
function getQueryStringValue (key) {
@@ -275,9 +270,8 @@ </div>
<div id="tpDiv">
- <object id="underlay_tp" data="UnderLay_TP.html" width="100%" height="450" type="text/html"></object>
- <!--<iframe src="UnderLay_TP.html" style="width:100%;height:450px;" name="targetframe" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>-->
+ <iframe src="UnderLay_TP.html" style="width:100%;height:450px;" name="targetframe" allowTransparency="true" scrolling="no" frameborder="0">
+ </iframe>
</div>
<div id="filterTpLogicalType_select_popupcontainer" class="openo openo-select-popup-container openo-hide"
style="width: 155px; max-height: 130px; left: 628px; top: 104px; z-index: 1761;">
|