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

81041

2018-12-26 94c3b603ae4fd3f26e23a33e3eabc781d9c08846

 gx_tieta/WebRoot/js/base.js

@@ -26,7 +26,7 @@


// 检查当前用户是否在另一主机登陆

function checkUserlogin(){

   //console.info("check");

   console.info("check***********************");

   $.post("LoginAction_check",null,function(data){

      data = eval("(" + data.result + ")");

      user=data.uinf;

@@ -38,7 +38,7 @@
         window.location.href="login.jsp";         

      }else{

         clearInterval(timeID);

         timeID = setTimeout(checkUserlogin,5000);

         timeID = setTimeout(checkUserlogin,100);

      }

   }).error(function(){

      clearInterval(timeID);

@@ -412,7 +412,7 @@
            //console.info(data);

            document.getElementById("FBSDeviceIp").innerHTML=data.FbsDeviceIp;         //设备Ip

            document.getElementById("GroupIndexInFBSDevice").innerHTML=data.GroupIndexInFBSDevice;         //Bindex

				
            document.getElementById("installUser").innerHTML= data.install_user;   // 安装人员

            

            //显示电池组机历卡

            $('#card_infor').show();

@@ -424,7 +424,7 @@


//根据stationid查询基站的信息

function findStationInfoByStation(temp){

   console.info(JSON.stringify(temp));

   //console.info(JSON.stringify(temp));

   $.ajax({    

        type:"post",             

        url: "Battinf_exAction!serchByCondition",            

@@ -433,7 +433,7 @@
        data:"json="+JSON.stringify(temp),      

        success: function(data){ 

         var model = eval('('+data.result+')');

         console.log(model);

         //console.log(model);

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

            var station = model.data[0];

            //console.info(station);

@@ -617,7 +617,7 @@
   $.post("Battalarm_dataAction!serchRealTime",null,function(data){

      model=eval("("+data.result+")");

      if(model.code==1){

         $('#batt_alarm_num').text(model.sum);

         $('#batt_alarm_num .num').text(model.sum);

         if(totalAlm_num<model.sum){            

            createEleWarning(model.sum-totalAlm_num);

         }