fix issue:GSO-99

Change-Id: I3ee94b91b136a3f8c3733661d3dc8558f364d5d7
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

1 files changed, 20 insertions, 6 deletions

diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html
index 7656f57b..2604de80 100644
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html
@@ -36,11 +36,25 @@
         <script type="text/javascript">

             $(document).ready(function () {

                 var jsondata = [];

-                jsondata = loadOverlayData();

+				var params = new URLSearchParams(window.location.search.slice(1));

+				var serviceId = params.get("serviceId");

+                jsondata = loadOverlayData(serviceId);

+				var tabData = [];

+				

+				var tableRow = {};

+				tableRow.desc = jsondata.description;

+				tableRow.name= jsondata.name;

+				tableRow.thinCpe= jsondata.site.cidr;//TODO

+				tableRow.port = "";

+				//tableRow.dcName=jsondata.vpc.name;

+				tableRow.vpc = jsondata.vpc.name;

+				tableRow.vpcCidr= jsondata.vpc.site.cidr;

+				tabData[0]=tableRow;

+

 

                 $('#sai').bootstrapTable({

                     //Assigning data to table

-                    data: jsondata

+                    data: tabData

                 });

             $('.table tbody tr').click(function () {

                 $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');

@@ -264,10 +278,10 @@
                         <tr>

                             <th data-field="name" data-sortable="true" data-filter-control="input">Name</th>

                             <th data-field="desc" data-sortable="true" data-filter-control="input">Description</th>

-                            <th data-field="thinCpe" data-sortable="true" data-filter-control="input">Thin CPE</th>

+                            <th data-field="thinCpe" data-sortable="true" data-filter-control="input">Site CIDR</th>

                             <th data-field="port" data-sortable="true" data-filter-control="input">Port:Vlan ID</th>

-                            <th data-field="dcName" data-sortable="true" data-filter-control="input">DC Name</th>

-                            <th data-field="vpc" data-sortable="true" data-filter-control="input">VPC</th>

+                           <!-- <th data-field="dcName" data-sortable="true" data-filter-control="input">DC Name</th> -->

+                            <th data-field="vpc" data-sortable="true" data-filter-control="input">VPC Name</th>

                             <th data-field="vpcCidr" data-sortable="true" data-filter-control="input">VPC CIDR</th>

                             <th data-field="action" data-sortable="">Action</th>

                         </tr>

@@ -278,6 +292,6 @@
         </div>

     </div>

 

-

+</div>

 </body>

 </html>
\ No newline at end of file