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

hdw

2019-01-16 cdd5fe1813e63adcddd61581cb886b9d154e5a3c

 gx_tieta/WebRoot/mobil/batt-approved1.html

@@ -89,7 +89,7 @@
                              <tr>

                                 <td>机房名称</td>

                                 <td>

                                    <input type="text" id="homeName"  class="unable" data-mini="true">        	
                                    <textarea id="homeName" class="unable" data-mini="true"></textarea>		
                                 </td>

                              </tr>

                              <tr>   

@@ -162,19 +162,7 @@
                                 </td>

                              </tr>

                              

                              <tr>

                                 <td>*通讯计数</td>

                                 <td>

                                    <input type="text" id="tongxunnumber" class="unable" data-mini="true" />

                                 </td>

                              </tr>

										
                              <tr>

                                 <td>*丢包率</td>

                                 <td>

                                    <input type="text" id="diubaonumber" class="unable" data-mini="true" />

                                 </td>

                              </tr>

									
                              

                              <tr>

                                 <td>*是否验收</td>

@@ -318,8 +306,8 @@
   var arr = temp;

   

   function setcookieCreat(i){

   console.info(temp);

   console.info(i)

      console.info(temp);

      console.info(i)

      //var index=Math.ceil(i-1);

      arrdata = temp[i].binf;

      console.info(arrdata);

@@ -336,7 +324,7 @@
      }

      

      // 存储所有的数据

      $('#homeInfoIframeAll').data('allData', temp);

   $('#homeInfoIframeAll').data('allData', temp);

      var _data = temp[0];

      var _temp = {

         homeId: _data.binf.StationId

@@ -347,7 +335,7 @@
      }

      

      // 存储需要的homeInfo信息

      $('#homeInfoIframe').data('homeInfo', _temp);

   $('#homeInfoIframe').data('homeInfo', _temp);

      

      iframePopup = layer.open({

             type: 2

@@ -357,6 +345,12 @@
             ,full: true

             ,anim: 4

             ,content: 'iframe/homeinfo1.html'

             ,success: function() {

                $('div[data-role=page]').hide();

             }

             ,end: function() {

                $('div[data-role=page]').show();

             }

         });

         layer.full(iframePopup);

   })

@@ -377,20 +371,18 @@


   $(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秒刷新一次页面

      //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));		
      installstartdata(temp);//导入初始页面值

      //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

@@ -404,15 +396,19 @@
            url: 'Battinf_applyAction!serchById',

            data: "json="+data,

            dataType: 'json',

            success:function(data) {

				
            data = JSON.parse(data.result);

            console.info(data);

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

               data = data.data;

               //console.info(data[0].check_en);

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

            }

            success:function(data) {				
               data = JSON.parse(data.result);

               console.info(data);

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

                  data = data.data;

                  //console.info(data[0].check_en);

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

               }

					
               // 更新内容

               updateinstalldata.timer = setTimeout(function() {

                  updateinstalldata();

               }, 4000);

            }

         });

    }

@@ -512,67 +508,40 @@
         }

   }

   

   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(){    //向获取所有通讯计数并存入缓存

      $.ajax({



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

    $.ajax({

          type: 'post',

         async: true,

         url: 'Battinf_applyAction!devCommNum',

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

@@ -652,13 +621,6 @@
           });  

      });



    function nullOrn(){

	
          return true;

	 	
 	
    }

 	
    function editBatt(){//

       console.info(getUpdateArr());

       var temp = JSON.stringify(getUpdateArr());