Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
===================================================================
diff -u -r34149 -r34216
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 34149)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 34216)
@@ -189,6 +189,7 @@
 
 Ext.onReady(function () {
 	Ext.QuickTips.init();
+	Ext.Ajax.timeout = 300000;
 	// 记录cookie（3步）
 	var supplyRoomRecord = Ext.data.Record.create([
 		{ name: 'departCode', type: 'string' },
@@ -341,7 +342,20 @@
 					myMask.hide();
 				},
 				failure: function (response, options) {
-					showResult(response.responseText);
+					if(response.status == -1){
+						top.Ext.Msg.show({
+							title: '提示',
+							msg: '服务器响应缓慢，数据查询超时，请与系统管理员联系或者稍后再试！',
+							buttons: {"yes":"确认","no":"取消"},
+							fn : function(btn){
+								if(btn == 'yes'){
+									myMask.hide();
+								}
+							}
+						});
+					}else if(response.responseText){
+						showResult(response.responseText);
+					}
 				}
 			});
 		}