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

hdw

2019-01-03 bba339575f11b6922b7cadda4eca2dddaa728e08

 gx_tieta/WebRoot/mobil/batt-approved1.html

@@ -378,19 +378,17 @@
   $(function () {

      //setTimes($("#startTestrecord"),'2000-01-01');

      //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));

			
   installstartdata(temp);//导入初始页面值

   diubao();//初始丢包率

   updateinstalldata(temp);//实时更新验收状态

   timeer = window.setTimeout(function() {

         diubao();

         updateinstalldata(temp);						
                  }, 4000);   //丢包率，通信计数，4秒刷新1次。

      //4秒刷新一次页面

      getnewnumber(temp[0].binf.FBSDeviceId);

      updateinstalldata();

   });

   var timeer = '';

    

    function updateinstalldata(temp){

       //console.info(temp);

    
    function updateinstalldata(){

       console.info(temp);

       // 清除计时器

       clearInterval(updateinstalldata.timer);

       var data=temp[0].binf.StationId;

       var _data ={ binf:{

                StationId:data

@@ -405,7 +403,6 @@
            data: "json="+data,

            dataType: 'json',

            success:function(data) {

				
            data = JSON.parse(data.result);

            console.info(data);

            if(data.code==1&&data.data.length>0){

@@ -413,6 +410,11 @@
               //console.info(data[0].check_en);

               document.getElementById("check_en").value = yanshou(data[0].check_en);

            }

					
               // 更新内容

               updateinstalldata.timer = setTimeout(function() {

                  updateinstalldata();

               }, 4000);

            }

         });

    }

@@ -512,31 +514,8 @@
         }

   }

   

   function diubao(){

      if(temp.length>0){

         data=temp[0].binf;

         document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);

         document.getElementById("diubaonumber").value = getCookiediubao(data.StationId);

      }	
   }

    function getCookienumber(id){//输入ID，返回通讯计数。数据从缓存获取。

       var a = getnumber();

       //console.info(a);

       if(getCookie("numberget")){

          var number = getCookie("numberget");

          number = JSON.parse(number);

          console.info(number);

          if(number[0]){

             for(var i =0; i<number.length;i++){

                if(id == number[i].dev_id){

                   return number[i].dev_commcount;

                }

             }	
          }

       }

       return 0;

    }

    function getnumber(){    //向获取所有通讯计数并存入缓存



    function getnewnumber(id){//丢包率，通讯计数

      $.ajax({

          type: 'post',

         async: true,

@@ -544,35 +523,31 @@
         data: null,

         dataType: 'json',

         success:function(data) {

            console.info(data);

            data = JSON.parse(data.result);

            if(data.code==1){

               console.info(data.data);

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

               setCookie("numberget",json);

               //return data.data;	
               data=data.data;

               console.info(data[0]);

               for(var i=0;i<data.length;i++){

               console.info(data[i].dev_id);

               console.info(id)

                  if(data[i].dev_id==id){

                     console.info(id);						
                     document.getElementById("tongxunnumber").value = data[i].dev_commcount;

                     var errorCount = data[i].dev_errcommcount;

                      var allCount = data[i].dev_commcount+errorCount;

                      var parcent = (allCount==0?0:errorCount/allCount*100);

                      console.info(parcent);

                      document.getElementById("diubaonumber").value = parcent;

                  }

               }

            }

         }

      });

    }

    

    function getCookiediubao(id){   //丢包率

       if(getCookie("numberget")){

          var number = getCookie("numberget");

          number = JSON.parse(number);

          console.info(number);

          if(number[0]){

             for(var i =0; i<number.length;i++){

                if(id == number[i].dev_id){

                   var errorCount = number[i].dev_errcommcount;

                   var allCount = number[i].dev_commcount+errorCount;

                   var parcent = (allCount==0?0:errCount/allCount*100)

                   return parcent;

                }

             }	
          }

       }

       return 0;

    }

	
   // 格式化提交后台信息的对象数组并返回 单个修改，手机方式不修改多个电池组

      function getUpdateArr(){

         mon=$('#MonVolStd').val();

@@ -651,13 +626,6 @@
           //window.location.href="control.html"; 

           });  

      });



    function nullOrn(){

	
          return true;

	 	
 	
    }

    

    function editBatt(){//

       console.info(getUpdateArr());