更改信号强度显示的位置

hdw

2018-11-13 854f2b7f6876c25ec12290c8f2d39671113b35f8

 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);

         });

      });

   

@@ -4352,6 +4353,8 @@
         // 电池组

         treeView.ele.on('click', '.eleGroup', function() {

            var eleGroup = $(this).data('attr');

            var status = GLOBAL.circleStatus.status;

            var btsOpts = GLOBAL.circleStatus.btsOpts;

            // 根据BattGroupId查询数据

            if(BattGroupId != eleGroup.BattGroupId) {

               BattGroupId = eleGroup.BattGroupId;

@@ -4377,7 +4380,11 @@
               // 负载电流

               var loadCurr = batt.Load_curr+'A';

               changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

               changeEleCircleOpt(eleCircle, 'signal', {isShow:false});

               //changeEleCircleOpt(eleCircle, 'signal', {isShow:false});

               // 显示信号强度

               status.setText('signal', '', true);

               // 更新配置项的值

               status.updateOpts('signal', btsOpts, {notShow: true});

               // 最大核容电流

               var disCurrMax = batt.DisCurrMax+'A';

               changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流：'+disCurrMax});

@@ -4422,6 +4429,36 @@
         //全部收缩

         $('#all_hide').click(function(){

            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));

         });

         

         // 工具条整体样式

@@ -4780,6 +4817,9 @@
         // 点击查看当前信号的质量

         $('#signalBtn').click(function() {

            var batt = getBatt();

            var status = GLOBAL.circleStatus.status;

            var btsOpts = GLOBAL.circleStatus.btsOpts;

            //var btsOpts = GLOBAL.circleStatus.btsOpts;

            signalSearch.dev_id = batt.FBSDeviceId;

            var load = layer.load(1);

            // 请求后台获取信号的质量

@@ -4805,7 +4845,12 @@
               

               // 图片描述

               signalOpts.name = '信号强度：'+signalInfo.signal;

               changeEleCircleOpt(eleCircle, 'signal', signalOpts);

               //console.log(signalOpts.name);

               // 显示信号强度

               status.setText('signal', signalOpts.name);

               // 更新配置项的值

               status.updateOpts('signal', btsOpts, {notShow: false});

               //changeEleCircleOpt(eleCircle, 'signal', signalOpts);

            });

            

         });

@@ -4895,7 +4940,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;