Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp =================================================================== diff -u -r40908 -r40925 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40908) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40925) @@ -141,6 +141,8 @@ var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>'; //FSEYEQ-26:新增型号:Clean H101513(灭菌器型号) var XINHUA_PDF_CLEAN_H101513 = '<%=DeviceInterface.XINHUA_PDF_CLEAN_H101513%>'; +//FSEYEQ-26:新增型号:super6000(清洗机型号) +var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>'; Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r40908 -r40925 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40908) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40925) @@ -141,7 +141,7 @@ if (sstsConfig.washDataLineChartType == 1) { if (data.deviceModel == changlong_DC_4) { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513) { + } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { //FSEYEQ-26:获取新华pdf文件 var params = { washAndDisinfectRecordId: id @@ -153,7 +153,7 @@ } else { if (data.deviceModel == changlong_DC_5) { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513) { + } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { //FSEYEQ-26:获取新华pdf文件 var params = { washAndDisinfectRecordId: id Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r40908 -r40925 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40908) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40925) @@ -475,7 +475,7 @@ if (sstsConfig.washDataLineChartType == 1) { if (data.deviceModel == changlong_DC_4) { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513) { + } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { //FSEYEQ-26:获取新华pdf文件 var params = { washAndDisinfectRecordId: id @@ -487,7 +487,7 @@ } else { if (data.deviceModel == changlong_DC_5) { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513) { + } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { //FSEYEQ-26:获取新华pdf文件 var params = { washAndDisinfectRecordId: id Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp =================================================================== diff -u -r40908 -r40925 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp (.../interfereWashAndDisinfectRecordView.jsp) (revision 40908) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp (.../interfereWashAndDisinfectRecordView.jsp) (revision 40925) @@ -50,6 +50,8 @@ var WASHDATATYPE_STERIS_CHANGLONG = '<%=WashAndDisinfectRecord.WASHDATATYPE_STERIS_CHANGLONG%>'; //FSEYEQ-26:新增型号:Clean H101513(灭菌器型号) var XINHUA_PDF_CLEAN_H101513 = '<%=DeviceInterface.XINHUA_PDF_CLEAN_H101513%>'; + //FSEYEQ-26:新增型号:super6000(清洗机型号) + var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';