Index: ssts-web/src/main/webapp/js/commonUtils.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/js/commonUtils.js	(.../commonUtils.js)	(revision 40959)
+++ ssts-web/src/main/webapp/js/commonUtils.js	(.../commonUtils.js)	(revision 41012)
@@ -61,8 +61,11 @@
 }
 
 //FSEYEQ-26：显示清洗机数据图形（通用）
-function getWashDataLineCharByIframeUtil(id, deviceModel, isPrint) {
+function getWashDataLineCharByIframeUtil(id, deviceModel, deviceBrand) {
     var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel;
+    if (deviceBrand) {
+        url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=' + deviceBrand
+    }
     var win = new top.Ext.Window({
         title: '清洗参数',
         id: 'extWindow' + id,
@@ -79,9 +82,14 @@
             html: "<iframe id='thisIframe' src='" + url + "' scrolling='yes' frameborder=0 width=835 height=610></iframe>"
         }],
         buttons: [{
+            text: '导出PDF',
+            id: 'exportPdf',
+            handler: function () {
+                top.document.getElementById('thisIframe').contentWindow.document.getElementById('export').click();
+            }
+        }, {
             text: '打印',
             id: 'print',
-            hidden: true,
             handler: function () {
                 top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click();
             }
@@ -94,13 +102,10 @@
         }]
     })
     win.show()
-    if (isPrint) {
-        top.Ext.getCmp('print').show();
-    }
 }
 
 //FSEYEQ-26：显示灭菌数据图形（通用）
-function getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType, isPrint) {
+function getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType) {
     var url = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp?sterilizationRecordId=' + id + '&sterilizationParaType=' + sterilizationParaType;
     var win = new top.Ext.Window({
         title: '灭菌参数',
@@ -118,9 +123,14 @@
             html: "<iframe id='thisIframe' src='" + url + "' scrolling='yes' frameborder=0 width=1035 height=670></iframe>"
         }],
         buttons: [{
+            text: '导出PDF',
+            id: 'exportPdf',
+            handler: function () {
+                top.document.getElementById('thisIframe').contentWindow.document.getElementById('export').click();
+            }
+        }, {
             text: '打印',
             id: 'print',
-            hidden: true,
             handler: function () {
                 top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click();
             }
@@ -133,7 +143,4 @@
         }]
     })
     win.show()
-    if (isPrint) {
-        top.Ext.getCmp('print').show();
-    }
 }
\ No newline at end of file