Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r26224 -r26404
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 26224)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 26404)
@@ -3,6 +3,7 @@
<%@ include file="/common/taglibs.jsp"%>
<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig,com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%>
@@ -63,6 +64,10 @@
var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
+
+ var changLong = '<%= DeviceInterface.CHANGLONG %>';
+ var marge = '<%= DeviceInterface.MARGE %>';
+ var xinHua = '<%= DeviceInterface.XINHUA %>';
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r26225 -r26404
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 26225)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 26404)
@@ -33,7 +33,23 @@
* @param id 清洗记录的id
*/
this.openWashDataLineChart = function(id){
- openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
+ Ext.Ajax.request({
+ url: WWWROOT +'/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId='+id+'&time='+new Date(),
+ success: function(result){
+ var resultStr = Ext.decode(result.responseText);
+ var data = resultStr.data
+ if(data.deviceBrand == changLong){
+ openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
+ }else if (data.deviceBrand == marge){
+ openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId='+id+'&deviceModel='+data.deviceModel, '清洗参数', '800', '600');
+ }else if(data.deviceBrand == xinHua){
+ if(data.deviceModel == changLong){
+ openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
+ }
+ }else{
+ openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
+ }
+ }});
}