Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r41647 -r41666
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 41647)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 41666)
@@ -200,14 +200,14 @@
 									fields: ['value'],
 									data: [[' '], [BELIMED_MODEL_SINGLE_WAREHOUSE], [BELIMED_MODEL_LONG_DRAGON]]
 								})
-								showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
+								showCmt('deviceModelWrap', 'deviceModel', true, versionComboStore);
 							} else {
 								hideCmt('paraMatchingMethodWrap', 'paraMatchingMethod', true);
 								var versionComboStore = new Ext.data.SimpleStore({
 									fields: ['value'],
 									data: [[' '], [BELIMED_MST_9_6_18_HS2], [BELIMED_MST_9_6_18_VS2], [BELIMED_WD_290]]
 								})
-								showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
+								showCmt('deviceModelWrap', 'deviceModel', true, versionComboStore);
 							}
 						}
 					}
@@ -591,14 +591,14 @@
 					fields: ['value'],
 					data: [[' '], [BELIMED_MODEL_SINGLE_WAREHOUSE], [BELIMED_MODEL_LONG_DRAGON]]
 				})
-				showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
+				showCmt('deviceModelWrap', 'deviceModel', true, versionComboStore);
 			} else {
 				hideCmt('paraMatchingMethodWrap', 'paraMatchingMethod', true);
 				var versionComboStore = new Ext.data.SimpleStore({
 					fields: ['value'],
 					data: [[' '], [BELIMED_MST_9_6_18_HS2], [BELIMED_MST_9_6_18_VS2], [BELIMED_WD_290]]
 				})
-				showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
+				showCmt('deviceModelWrap', 'deviceModel', true, versionComboStore);
 			}
 		}
 		showCmt('interfaceTypeWrap', 'interfaceType', true, interfaceTypeStore);
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r41647 -r41666
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41647)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41666)
@@ -175,15 +175,17 @@
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfYouYuan.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				}
 			} else if (data.deviceBrand == STERIS) {
+				var deviceBrand = data.deviceBrand;
 				// DGSFYBJY-54 史帝瑞清洗机(型号：AMSCO 3052)
 				if (data.deviceModel == STERIS_AMSCO_3052) {
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				} else if (data.deviceModel == STERIS_CHANGLONG) {
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				} else {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id+ '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600');
 				}
 			} else if (data.deviceBrand == 'Belimed') {
+				var deviceBrand = data.deviceBrand;
 				//NFYY-98：查看pdf文件
 				if (data.deviceModel == 'WD290') {
 					//暂时不支持IE
@@ -197,12 +199,12 @@
 						// 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');
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id+ '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600');
 					}
 				}else if(data.deviceModel == BELIMED_MODEL_SINGLE_WAREHOUSE){
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600');
 				}else {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id+ '&deviceBrand=' + deviceBrand, '', '清洗参数', '800', '600');
 				}
 			} else if (data.deviceBrand == JNK) {
 				if (data.deviceModel == DEVICETYPE_JK_NQX1500) {