Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r40908 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 40908)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 41151)
@@ -424,7 +424,7 @@
 	var deviceBrand = top.Ext.getCmp('deviceBrand').getValue();
 	var deviceModel = top.Ext.getCmp('deviceModel').getValue();
 	if (deviceBrand == MARGE) {
-		if (deviceModel == MARGE_MODEL_120_CSV || deviceModel == MARGE_MODEL_MAG_GSZK385_CSV) {
+		if (deviceModel == MARGE_MODEL_120_CSV || deviceModel == MARGE_MODEL_MAG_GSZK385_CSV || deviceModel == MARGE_MODEL_MAG_GSZK260_CSV) {
 			showCmt('interfaceTypeWrap', 'interfaceType', true, interfaceTypeStore);
 			showCmt('folderPathWrap', 'folderPath', true);
 			showCmt('userNameWrap', 'userName', true);
@@ -491,13 +491,13 @@
 	} else if (deviceBrand == MARGE) {
 		var margeModelComboStore = new Ext.data.SimpleStore({
 			fields: ['value'],
-			data: [[' '], [MARGE_MODEL_120], [MARGE_MODEL_120_CSV], [MARGE_MODEL_150], [MARGE_MODEL_DRYER], [MARGE_MODEL_MAG_GSZK385_CSV], [MARGE_MODEL_MAG_CL4]]
+			data: [[' '], [MARGE_MODEL_120], [MARGE_MODEL_120_CSV], [MARGE_MODEL_150], [MARGE_MODEL_DRYER], [MARGE_MODEL_MAG_GSZK385_CSV], [MARGE_MODEL_MAG_CL4], [MARGE_MODEL_MAG_GSZK260_CSV]]
 		})
 		showCmt('deviceModelWrap', 'deviceModel', false, margeModelComboStore);
 		if (clearValue) {
 			top.Ext.getCmp("deviceModel").setValue('');
 		}
-		if (deviceModel == MARGE_MODEL_120_CSV || deviceModel == MARGE_MODEL_MAG_GSZK385_CSV) {
+		if (deviceModel == MARGE_MODEL_120_CSV || deviceModel == MARGE_MODEL_MAG_GSZK385_CSV  || deviceModel == MARGE_MODEL_MAG_GSZK260_CSV) {
 			showCmt('interfaceTypeWrap', 'interfaceType', true, interfaceTypeStore);
 			if (clearValue) {
 				top.Ext.getCmp("interfaceType").setValue('');
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r41118 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41118)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41151)
@@ -131,7 +131,7 @@
 			}
 			var data = resultStr.data;
 			if (data.deviceBrand == marge) {
-				if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
+				if (data.deviceModel == MARGE_MODEL_MAG_CL4 || data.deviceModel == MARGE_MODEL_MAG_GSZK260_CSV) {
 					winByDeviceModel(id, data.deviceModel);
 				} else {
 					var deviceModel = encodeURIComponent(data.deviceModel);
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
===================================================================
diff -u -r40959 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 41151)
@@ -461,7 +461,7 @@
 			}
 			var data = resultStr.data;
 			if (data.deviceBrand == marge) {
-				if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
+				if (data.deviceModel == MARGE_MODEL_MAG_CL4 || data.deviceModel == MARGE_MODEL_MAG_GSZK260_CSV) {
 					if(isFrame){
 						var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp?washAndDisinfectRecordId=' + id + '&deviceModel='+data.deviceModel + '&washDataRecordId=' + washDataRecordId;
 						top.document.getElementById('thisIframe').src = url;
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
===================================================================
diff -u -r40908 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 40908)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 41151)
@@ -92,6 +92,8 @@
 var XINHUA_PDF_CLEAN_H101513 = '<%=DeviceInterface.XINHUA_PDF_CLEAN_H101513%>';
 //FSEYEQ-26：新增型号：super6000(清洗机型号)
 var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
+//BJDXZLYY-66：新增型号：MAG-GSZK260（CSV格式）
+var MARGE_MODEL_MAG_GSZK260_CSV = '<%=DeviceInterface.MARGE_MODEL_MAG_GSZK260_CSV%>';
 /**
  * 负压清洗机（PC-L）(张家界市人民医院ZJJSRM-6)
  */
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r40959 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 41151)
@@ -50,6 +50,8 @@
 	var WASHDATATYPE_STERIS_CHANGLONG = '<%=WashAndDisinfectRecord.WASHDATATYPE_STERIS_CHANGLONG%>';
 	//FSEYEQ-26：新增型号：super6000(清洗机型号)
 	var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
+	//BJDXZLYY-66：新增型号：MAG-GSZK260（CSV格式）
+	var MARGE_MODEL_MAG_GSZK260_CSV = '<%=DeviceInterface.MARGE_MODEL_MAG_GSZK260_CSV%>';
 </script>
 
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r41116 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 41116)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 41151)
@@ -128,6 +128,8 @@
 var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>';
 //FSEYEQ-26：新增型号：super6000(清洗机型号)
 var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
+//BJDXZLYY-66：新增型号：MAG-GSZK260（CSV格式）
+var MARGE_MODEL_MAG_GSZK260_CSV = '<%=DeviceInterface.MARGE_MODEL_MAG_GSZK260_CSV%>';
 </script>
 
 <!-- 日期控件引入 -->
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp
===================================================================
diff -u -r40401 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp	(.../washDataChartOfExt.jsp)	(revision 40401)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp	(.../washDataChartOfExt.jsp)	(revision 41151)
@@ -24,6 +24,9 @@
 		var WWWROOT = '${basePath}';
 	</script>
 	<style type="text/css">
+		body,html {
+			height: 100%;
+		}
 		* {
 			padding: 0;
 			margin: 0;
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js
===================================================================
diff -u -r40401 -r41151
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js	(.../washDataChartOfExt.js)	(revision 40401)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js	(.../washDataChartOfExt.js)	(revision 41151)
@@ -42,10 +42,11 @@
 }
 
 $(function () {
+    var actualHeight = document.body.clientHeight;
     $.ajax({
         type: "get",
         url: WWWROOT + "/disinfectSystem/washData/washDataLineChartAction!getWashDataAndLineEchartDate.do",
-        data: { washAndDisinfectRecordId: washAndDisinfectRecordId,washDataRecordId:washDataRecordId },
+        data: { washAndDisinfectRecordId: washAndDisinfectRecordId, washDataRecordId: washDataRecordId },
         dataType: "json",
         success: function (result) {
             if (result.success) {
@@ -103,6 +104,8 @@
                         items: [{
                             layout: 'column',
                             columnWidth: 1,
+                            id: 'chartBox',
+                            hidden: xAxisData.length == 0,
                             items: [{
                                 xtype: "fieldset",
                                 title: '参数变化图',
@@ -120,7 +123,8 @@
                                 xtype: "fieldset",
                                 title: '详细参数',
                                 layout: 'column',
-                                height: 254,
+                                height: xAxisData.length == 0 ? actualHeight : actualHeight - 350,
+                                autoScroll: true,
                                 columnWidth: 1,
                                 labelWidth: 120,
                                 items: dataItems
@@ -129,7 +133,9 @@
                     });
 
                     formObj.render("formDiv");
-                    creatLineChart("winByNQX1500Chart", xAxisData, seriesData, sumTime);
+                    if (xAxisData.length > 0) {
+                        creatLineChart("winByNQX1500Chart", xAxisData, seriesData, sumTime);
+                    }
                 } else {
                     showResult('没有数据！');
                 }