hdw
2018-11-12 c22971419e96c3a5acde4526741b0233291f84ab
gx_tieta/WebRoot/control.jsp
@@ -1151,6 +1151,7 @@
   <script type="text/javascript" src="js/dischargetest/sysData.js"></script>
   <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
   <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
   <script type="text/javascript" src="js/rightmenu.js"></script>
   <!-- 引入电路图 -->
   <script type="text/javascript" src="js/elecircle.js"></script>
   <script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -3041,8 +3042,8 @@
            var city = batt.StationName2;
            var county = batt.StationName5;
            var home = batt.StationName;
            var homeid = batt.BattGroupId;
            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
            var battid = batt.BattGroupId;
            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
         });
      });
   
@@ -4424,6 +4425,36 @@
            treeView.ele.find('li').removeClass('sider-menu-open');
         });
         
         // 电路拓扑图右键菜单
         var menuItems = [
            {txt: '机房状态查询', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
            {txt: '机房流量统计查询', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
            {txt: '机房续航能力查询', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
            {txt: '设备充放电模块状态', cla:'target', data: {target: 'equip-charge-param.jsp'}},
         ];
         // 给表格添加自己的右键菜单
         $('#contai').on('mousedown','.ele-circle',function(e){
            var batt = getBatt();
            if (e.which == 3) {
               var disX = (e || event).clientX + 10;   //获取鼠标点击的横坐标
               var disY = (e || event).clientY + 10;   // 获取鼠标点击的纵坐标
               rightMenu.showMenu(menuItems, disX, disY);
            }
         });
         $('body').on('click', '#rightMenu .target', function() {
            var batt = getBatt();
            var pageName = $(this).data('data').target;
            var province = batt.StationName1;
            var city = batt.StationName2;
            var county = batt.StationName5;
            var home = batt.StationName;
            var battid = batt.BattGroupId;
            // 实现跳转
            window.open(skipUrl(pageName, province, city, county, home, battid));
         });
         // 工具条整体样式
         $('.siderbar-tools').tooltip();
         
@@ -4895,7 +4926,7 @@
               data: "json = " + JSON.stringify(temp),
               success: function(result) {
                   var rs = JSON.parse(result.result);
                   console.info(rs);
                   //console.info(rs);
                   if(rs.code == 1){
                      var dcdcWarn = '';
                      var data = rs.data;