修改内容

hdw

2018-11-12 c426db921a97e78ad9e741301bdd346b7aba6f11

 gx_tieta/WebRoot/control.jsp

@@ -25,7 +25,7 @@
   <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">

   <link rel="stylesheet" type="text/css" href="css/confirm.css">

   <link rel="stylesheet" type="text/css" href="src/css/layui.css">

   <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">

   <!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->

   <script type="text/javascript" src="js/echarts.js"></script>

   <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

   <script type="text/javascript" src="js/base.js"></script>

@@ -246,6 +246,11 @@
                        <a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-gear"></span>

                           <span class="whyc-btn-txt">系统参数</span>

                        </a>

                        <br>

                        <a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-signal"></span>

                           <span class="whyc-btn-txt">信号质量</span>

                        </a>

                       </div>

                  </div>

@@ -1125,6 +1130,8 @@
   <!-- 整体的遮罩层 -->

   <div id="allShade"></div>

   <div class="clear"></div>

   <!-- 引入layui框架 -->

   <script type="text/javascript" src="src/layui.all.js"></script>

   <script type="text/javascript" src="pages/js/common.js"></script>

   <script type="text/javascript" src="js/jquery.bigcolorpicker.min.js"></script>

   <script type="text/javascript" src="jqueryui/jquery-ui.js"></script>

@@ -1147,8 +1154,6 @@
   <!-- 引入电路图 -->

   <script type="text/javascript" src="js/elecircle.js"></script>

   <script type="text/javascript" src="js/elecircle.content.js"></script>

   <!-- 引入layui框架 -->

   <script type="text/javascript" src="src/layui.all.js"></script>

   <script type="text/javascript">

   var permits;

   <%   Object obj=session.getAttribute("permits");

@@ -3025,7 +3030,8 @@
            var city = batt.StationName2;

            var county = batt.StationName5;

            var home = batt.StationName;

            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);

            var homeid = batt.BattGroupId;

            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);

         });

      });

   

@@ -3124,9 +3130,7 @@
   function targetBattReport(){

      var batt = getBatt();      

      var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);

      //console.info(url);

      window.open(url);

      //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);

   }

   // 使用jquery实现左导航的显示和隐藏

   $(document).ready(function(){

@@ -4328,7 +4332,7 @@
               // 负载电流

               var loadCurr = batt.Load_curr+'A';

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

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

               // 最大核容电流

               var disCurrMax = batt.DisCurrMax+'A';

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

@@ -4718,6 +4722,66 @@
            

            return rs;

         }

			
         // 查询信号质量模块

         var gprs = GLOBAL.CMD.gprs;

         var signalSearch = {

            num: gprs.param,

            AT_cmd: gprs.signal,

            dev_id: ''

         };

         // 点击查看当前信号的质量

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

            var batt = getBatt();

            signalSearch.dev_id = batt.FBSDeviceId;

            var load = layer.load(1);

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

            searchStationSignal(signalSearch,function(data){

               layer.close(load);

               // 基础配置

               var signalOpts = {

                  img: signalBad,

                  isShow: true,

                  startX: 10,

                  startY: 30,

                  name: ''

               };

               var signalInfo = formatSignal(""); 
               if(data.code == 1) {

                  var csq = data.data.ack_inf;

                  signalInfo = formatSignal(csq);

               }

               // 显示图片类型

               if(signalInfo.img) {

                  signalOpts.img = signalGood;

               }

					
               // 图片描述

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

               changeEleCircleOpt(eleCircle, 'signal', signalOpts);

            });

				
         });

			
         // 解析信号质量结果

         function formatSignal(signal) {

            var rs = {

               signal: '未知',

               bitError: '未知',

               img: 0

            };

            var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

            var testCsq = ptn.test(signal);

            if(testCsq) {

               rs.signal = RegExp.$1;

               rs.bitError = RegExp.$2;

               if(rs.signal>20) {

                  rs.img = 1;

               }

            }

				
            return rs;

         }

      });

      

      // 机历卡模块

@@ -4737,6 +4801,29 @@
            tabContents.eq(index).addClass('con-show');

         });

      });

		
      var gprs = GLOBAL.CMD.gprs;

		
      var temp = {

         num: gprs.param,

         AT_cmd: gprs.signal,

         dev_id:910000577

      };

		
		
		
      /* searchStationSignal(temp,function(data){

         changeEleCircleOpt(eleCircle, 'signal', {

            img: signalBad,

            isShow: true,

         });

         var csq = data.data.ack_inf;

         var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

         var testCsq = ptn.test(csq);

         console.log(RegExp.$1);

         console.log(RegExp.$2);

         console.log(data.data.ack_inf);

      }); */

   </script>

   <script type="text/javascript" src="js/Title.js"></script>

   <script type="text/javascript" src="js/control.js"></script>