Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r37453 -r37648 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 37453) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 37648) @@ -131,7 +131,17 @@ openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } } else if (data.deviceBrand == 'Belimed') { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); + //NFYY-98:查看pdf文件 + if(data.deviceModel == 'WD290'){ + //暂时不支持IE + if(isIE()){ + showResult('IE浏览器不支持预览pdf文件,请切换谷歌浏览器!'); + }else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id,'', '清洗参数', '1050', '700'); + } + }else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); + } } else { if (sstsConfig.belimedLineChartType == 1) { // ZJJSRM-15倍力曼清洗机接口 Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp =================================================================== diff -u -r37613 -r37648 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp (.../showFileForPDF.jsp) (revision 37613) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp (.../showFileForPDF.jsp) (revision 37648) @@ -20,20 +20,38 @@ \ No newline at end of file