Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r27338 -r27343 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27338) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27343) @@ -55,25 +55,6 @@ Ext4.getCmp('btn_watchVideoBar').show(); } } - -/* - * 根据谷歌或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); - } - } function loadTousseInfo(td_id,tousseName){ //将点击或者扫描的器械包导入材料清单 materialForReviewViewStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}}); @@ -1735,7 +1716,7 @@ if(obj.success){ Ext.getCmp('reviewer').setValue(obj.fullName); Ext.getCmp('reviewerCode').setValue(obj.name); - googleOrIESpeak(obj.fullName); + speaker.speak(obj.fullName); }else{ showResult(obj.message , null , sstsConfig.messagePauseTimeOnReviewPage); } @@ -1788,7 +1769,7 @@ Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance); clearScanText(); onScannedTousseAmountChanged();// 待审核包数量数量变化处理 - googleOrIESpeak(obj.tousseName); + speaker.speak(obj.tousseName); if(sstsConfig.showTousseMaterialsInPackingReview && sstsConfig.showTousseMaterialsInPackingReview == true){ //如果启用材料清单,则将扫描的条码的信息导入材料清单 loadTousseInfo(obj.tousseDefinitionId,obj.tousseName); @@ -1857,7 +1838,7 @@ Ext.getCmp("basketName").setValue(obj.containerName); Ext.getCmp('basketBarcode').setValue(barcode); Ext.getCmp('barcode').setValue(''); - googleOrIESpeak(obj.containerName); + speaker.speak(obj.containerName); }else{ showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage); clearBarcodeAndBasketName(); @@ -1997,7 +1978,7 @@ Ext.getCmp("basketName").setValue(obj.containerName); Ext.getCmp('basketBarcode').setValue(barcode); Ext.getCmp('barcode').setValue(''); - googleOrIESpeak(obj.containerName); + speaker.speak(obj.containerName); }else{ showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage); clearBarcodeAndBasketName();