Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-16 cdd5fe1813e63adcddd61581cb886b9d154e5a3c

 gx_tieta/WebRoot/mobil/control.html

@@ -47,7 +47,7 @@
      </ul>

      <div data-role="collapsible" data-collapsed="false">

         <h1 id="jifangzhuangtai">机房状态</h1>

         <div class="tbl-container1"></div>

         <div class="tbl-container"></div>

       </div>

      <div data-role="collapsible" data-collapsed="false">

         <h1 id="zhuangtai">电池组状态</h1>

@@ -67,9 +67,9 @@
   <script type="text/javascript" src="js/battNav.js"></script>

   <script>

      var arrTh = ['电池状态：', '端电压：', '电池电流：', '测试日期：', '测试时长：', '测试容量：', '剩余容量：', '续航时间：'];

      var tbl = $('.tbl-container').eq(0);

      var tbl = $('.tbl-container').eq(1);

      var jifangarrTh = ['SD卡','通讯计数','通信丢包率','信号强度']

      var tbl1 = $('.tbl-container1').eq(0);

      var tbl1 = $('.tbl-container').eq(0);

      var arrtdjifangstate = new Array;

      var temp = getCookie("batt");

      var batt = JSON.parse(temp);

@@ -82,7 +82,7 @@
         //searchdiubao();

         createTbl(tbl1, jifangarrTh, arrTd1);

         //searchJifangInfo();

         searchSysData();

         //searchSysData();

      });

      $("#return").click(function(){

         var temp = getCookie("batt");

@@ -107,11 +107,11 @@
      $("#signalqual").click(function(){

         searchStationSignal();

      })

      $("battparm").click(function(){

         console.info("aaa")

      $("#battparm").click(function(){

         searchBattparm();

      })

      $("sysparm").click(function(){

      console.info("aaa")

      $("#sysparm").click(function(){

      //console.info("aaa")

         searchSysData();

      })

   

@@ -205,7 +205,39 @@
         });

      }

      

		
      function searchBattparm() {

               //console.info(temp);

            var temp={

               dev_id:batt.FBSDeviceId,

            }

            loadshow();

            // 查询电池参数

            $.ajax({

               type: 'post'

               ,async: true

               ,url:'Fbs9100_battparamAction_action_serchByCondition'

               ,data: 'json='+JSON.stringify(temp)

               ,dataType: 'json'

               ,success: function(res) {

                  var rs = JSON.parse(res.result);

                  console.log(rs);

                  if(rs.code==1){

                     var data = rs.data[0];

                     var json=window.JSON.stringify(data);

                            setCookie("control_battparm",json);

                            window.location.href="control_battparm.html"

                  }else{

                     alert("查询失败");

                  }

                  loadclose();

               }

               ,complete: function() {

                  loadclose();

               }

            });

			
         }

			
      function searchdiubao(arrTd1){

         $.ajax({    

              type: "post",             

@@ -273,6 +305,7 @@
               AT_cmd:"CSQ",

               dev_id:batt.FBSDeviceId,

      }

      loadshow();

      console.info(param);

      $.ajax({    

           type:"post",                         

@@ -290,6 +323,7 @@
               console.info(data.ack_inf);

               var msg=formatSignal(data.ack_inf);

               console.info(msg.signal);

               loadclose();

               alert(msg.signal);

            }

          },error:function(e){

@@ -331,6 +365,7 @@
      // 查询设备的系统参数

      function searchSysData() {

            // 开启等待框

            loadshow();

            var temp = {

               num:128,

               dev_id:batt.FBSDeviceId,

@@ -350,17 +385,20 @@
                         var data = rs.data[0];

                         console.info(data);

                         //if(showSU) {

                            alert('读取成功', true);

                            //alert('读取成功', true);

                            var json=window.JSON.stringify(data);

                            setCookie("control_parm",json);

		                		
                            window.location.href="control_sysparm.html"

                            loadclose();

                         //}

                      }else{

                         noContent.showNoContent('查询失败!');

                         loadclose();

                      }

                  },

                  error: function() {

                     noContent.showNoContent('查询失败!');

                     loadclose();

                     // 关闭等待    

                  }

              });