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

@@ -19,8 +19,8 @@
function exitUser(){

   $.post("LoginAction!exitUser",null,function(data){

      //console.info(data);

      window.location.replace("login.jsp");

   });

   window.location.replace("login.jsp");

}





@@ -570,7 +570,7 @@
   return null; 

}



function createEleWarning(num){

function createEleWarning(num, muted){

   //清理告警框

   $('body').children('#eleWarning').remove();

   var __divCon=$('<div id="eleWarning"></div>');  //告警容器

@@ -587,6 +587,10 @@
   var __divContentCon=$('<div class="warning-content"></div>');   //告警内容容器

   /* 告警的音频*/

   var __divAudio=$('<audio autoplay="autoplay"></audio>');

   // 判断是否静音

   if(muted) {

      __divAudio=$('<audio autoplay="autoplay" muted></audio>');

   }

   var __divSourceWav=$('<source src="sound/warnings.wav" type="audio/wav" />');

   var __divSourceMp3=$('<source src="sound/warnings.mp3" type="audio/mpeg" />');

   __divAudio.append(__divSourceWav);

@@ -612,17 +616,28 @@


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){

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

         if(totalAlm_num<model.sum){            

            createEleWarning(model.sum-totalAlm_num);

            var voiceStatus = checkPageVoiceStatus();

            createEleWarning(model.sum-totalAlm_num, !voiceStatus);

         }

         totalAlm_num=model.sum;

         

         // 5秒后关闭面板

         setTimeout(function() {
            $('body').children('#eleWarning').remove();
         }, 5000);

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

      }

   });