Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp =================================================================== diff -u -r27338 -r27343 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 27338) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 27343) @@ -102,24 +102,6 @@ return -1; }; } -/* - * 根据谷歌或IE浏览器选择不同的语音播放的方式 - */ - function googleOrIESpeak(content){ - if(!!window.ActiveXObject || "ActiveXObject" in window){ - if(speaker){ - speaker.speak(content); - } - }else { - var synth = window.speechSynthesis; - var googleSpeack = new SpeechSynthesisUtterance(); - //汉语 - googleSpeack.lang = 'zh-CN'; - googleSpeack.rate = 1; - googleSpeack.text = content; - synth.speak(googleSpeack); - } - } $.ajax({ type:'post', url:WWWROOT + '/disinfectSystem/invoiceAction!getTodayWaitSignInvoiceAmount.do?time='+new Date(), @@ -135,7 +117,7 @@ }); var messagePromptType = '<%=messagePromptType%>'; smartSpeaker.setType(messagePromptType); -googleOrIESpeak('签收人:' + '<%=userName%>'); +speaker.speak('签收人:' + '<%=userName%>'); function cancel(){ location.href = WWWROOT+'/homepage/portalPage.jsp'; } @@ -201,7 +183,7 @@ if(tousseName != null && tousseName.length > 0){ msg += tousseName; } - googleOrIESpeak(msg); + speaker.speak(msg); } function displayTousseInstanceInfo(tousseInstance,signType,barcode){ var status = tousseInstance.status; @@ -407,7 +389,7 @@ loadTodaySignedTousse(); }else{ if(typeof(data.message)=="undefined"){ - googleOrIESpeak(data.msg); + speaker.speak(data.msg); if(sstsConfig.signTipsMessage){ newAlert(data.msg); }else{ @@ -445,7 +427,7 @@ $("#tousseBarcodes").val(JSON.stringify(tousseBarcodes)); } }else{ - googleOrIESpeak(data.message); + speaker.speak(data.message); if(sstsConfig.signTipsMessage){ newAlert(data.message); }else{ @@ -462,7 +444,7 @@ } else { msg = "加载出错!" } - googleOrIESpeak(msg); + speaker.speak(msg); if(sstsConfig.signTipsMessage){ newAlert(msg); }else{