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

81041

2019-01-11 68dfe47cf6a32ac3560fc4b64e11eaa47c3bb6e7

 gx_tieta/WebRoot/js/base.js

@@ -616,8 +616,13 @@


var totalAlm_num=Number.POSITIVE_INFINITY;

//查询告警数

function searchAlm(){

   //createEleWarning();

function searchAlm(isShowVoice){

   // 判断是否显示右下角的告警提示框

   if(!isShowVoice) {

      self.setTimeout("searchAlm()",10000);

      return;

   }

   // 请求后台查询最新出现的告警个数

   $.post("Battalarm_dataAction!serchRealTime",null,function(data){

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

      if(model.code==1){