告警滚动，告警取消后提示消息修改

LiJun

2018-11-07 c12def5f240b452cd2100a69f91ff6375b4853b2

 gx_tieta/WebRoot/Top.jsp

@@ -557,7 +557,7 @@
   

   //查询电池告警信息

   function searchBattAlarm(data){

      //console.info(data);

      console.info(data);

      $.ajax({    

           type:"post",             

           url: "Battalarm_dataAction!serchBatt_alarm",            

@@ -574,16 +574,17 @@
            var model = eval('('+data.result+')');

            if(model.code == 1){

               var obj = model.data[0];

               //console.info(obj);

               console.info(obj);

               if(obj.alm_cleared_type == 0){

                  //实时告警

                  window.open("elewarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);

                  window.open("elewarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

               }else{

                  //历史告警

                  window.open("eleHistoryWarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);

                  window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

               }

            }else{

               alert("该告警已经被删除");

               alert("该告警已经恢复");

               //window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

            }            

          }             

      });

@@ -609,12 +610,12 @@
               var obj = model.data[0];

               console.info(obj);

               if(obj.alm_cleared_type == 0){

                  window.open("equipWarn1.jsp");

                  window.open("equipWarn1.jsp?home="+obj.stationName);

               }else{

                  window.open("equipHistWarn1.jsp?stationId="+obj.stationId);

                  window.open("equipHistWarn1.jsp?home="+obj.stationName);

               }

            }else{

               alert("该告警已经被删除");

               alert("该告警已经恢复");

            }      

          }             

      });

@@ -700,7 +701,7 @@
              data:null,      

              success: function(data){ 

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

               console.info(model);

               //console.info(model);

               if(model.code == 1){

                  $('#nuclear_test').text(model.data.length);

                  if(model.data.length != 0) {