Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r40399 -r40400 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40399) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40400) @@ -454,7 +454,12 @@ openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } else if (data.deviceBrand == marge) { if (data.deviceModel == MARGE_MODEL_MAG_CL4) { - winByDeviceModel(id, data.deviceModel); + if(isFrame){ + var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp?washAndDisinfectRecordId=' + id + '&deviceModel='+data.deviceModel; + top.document.getElementById('thisIframe').src = url; + }else { + winByDeviceModel(id, data.deviceModel); + } }else { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600'); }