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

81041

2018-11-30 b8b791df46b97c724e5f2dd0319bb6f527aecd62

 gx_tieta/WebRoot/js/base.js

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

         }