Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r41666 -r41667 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41666) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41667) @@ -195,21 +195,23 @@ openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '1050', '700'); } } else if (data.deviceModel == BELIMED_MODEL_LONG_DRAGON){ - if (sstsConfig.belimedLineChartType == 1) { - // ZJJSRM-15倍力曼清洗机接口 - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id+ '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600'); - } + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); }else if(data.deviceModel == BELIMED_MODEL_SINGLE_WAREHOUSE){ - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600'); + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); }else { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id+ '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600'); + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); } } else if (data.deviceBrand == JNK) { if (data.deviceModel == DEVICETYPE_JK_NQX1500) { winByDeviceModel(id, data.deviceModel); } + } else { + if (sstsConfig.belimedLineChartType == 1) { + // ZJJSRM-15倍力曼清洗机接口 + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + } } } });