Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r39038 -r39045 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 39038) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 39045) @@ -2374,12 +2374,8 @@ showWarningWin(); } -var urgentTimeOut; -var urgentTime = 60; function speakerUrgentVoice(msg,index){ showResultWithoutSpeak(msg); - urgentTime = 60; - setUrgentVoiceNotificationsTimeout(); var myAudio = new Audio(); myAudio.preload = true; myAudio.controls = true; @@ -2390,14 +2386,13 @@ function playEndedHandler(){ if(msg.length > (index + 1)){ setTimeout(function(){ - speakerUrgentVoice(msg,index+1); + speakerUrgentVoice(msg,index+1) }, 5000); } } } -//GDSRMYY-604:加急提醒 -function urgentNotification(){ +if(sstsConfig.enableUrgentVoiceNotificationsFunction){ Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/baseData/notification/urgentNotificationController/urgentNotification.mhtml', method : 'POST', @@ -2424,37 +2419,13 @@ speakerUrgentVoice(msgArr,0); }else { speaker.speak(msgArr.join(';')); - showResultWithoutSpeak(msgArr.join(';')); - urgentTime = 60; - setUrgentVoiceNotificationsTimeout(); } } - }else { - urgentTime = 60; - setUrgentVoiceNotificationsTimeout(); } } }); } -function setUrgentVoiceNotificationsTimeout(){ - if(urgentTimeOut){ - clearTimeout(urgentTimeOut) - } - if(urgentTime >= 0){ - urgentTimeOut = setTimeout(function(){ - urgentTime-- - setUrgentVoiceNotificationsTimeout(); - }, 1000); - }else { - urgentNotification(); - } -} - -if(sstsConfig.enableUrgentVoiceNotificationsFunction){ - setUrgentVoiceNotificationsTimeout(); -} - var doSync = false; function doShowSystemWarningWinByParam(isFirstOnLoad){ if(doSync){