Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js =================================================================== diff -u -r40922 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 40922) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 40959) @@ -152,7 +152,8 @@ function openSterilizerRecordDataLineChart(id, sterilizerRecordId, sterilizationParaType, sterilizerName) { //显示pdf文件的type - var showPdfForType = [15, parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; + var showPdfForType = [15]; + var commonPage = [parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; if (sterilizationParaType == 8 || sterilizationParaType == 9 || sterilizationParaType == 10 || sterilizationParaType == 11) { top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; @@ -178,13 +179,10 @@ top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; } else if (sterilizationParaType == 17) { top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; + } else if (commonPage.indexOf(sterilizationParaType) >= 0) { + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId + '&sterilizationParaType=' + sterilizationParaType; } else if (showPdfForType.indexOf(sterilizationParaType) >= 0) { - var params = { - sterilizationRecordId: id, - doc: top.document.getElementById('thisIframe'), - dataRecordId: sterilizerRecordId - } - getPDFFileUtil(params); + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; } }