Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r15317 -r15482 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15317) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15482) @@ -2276,17 +2276,21 @@ items : [ formObj ] }); sterilizationRecordWin.show(); + sterilizationRecordWin.on('close', function() { //关闭窗口就清除定时器 + clearInterval($refreshStartDateHandle); + }); formObj.form.load({ url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadSterilizationRecord.do', method : 'GET', waitMsg : '正在加载数据,请稍候', success : function(form, action) { if(id == 0) { - //top.Ext.getCmp('sterilizationPurpose').setValue('器械包灭菌'); + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'startDate', 60000, true); //(设置开始时间,取服务器时间,并且每秒刷新一下。cjr) + } else { + top.Ext.getCmp('startDate').setValue(formatDateYear(action.result.data.startDate)); + top.Ext.getCmp('endDate').setValue(formatDateYear(action.result.data.endDate)); } - top.Ext.getCmp('startDate').setValue(formatDateYear(action.result.data.startDate)); - top.Ext.getCmp('endDate').setValue(formatDateYear(action.result.data.endDate)); var frequency = action.result.data.frequency; if(reSterilization){ SterilizationRecordTableManager.getMaxFrequency(action.result.data.sterilizerName,0,function(result){ Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r15440 -r15482 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15440) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15482) @@ -1,5 +1,6 @@ $refreshStartDateHandle = null; //定时器的句柄(陈家儒改) $lastTime = 0; //定时器的上一分钟的时间戳 +$extObject = null; //ext对象: var bPageModified=false; var wheight=window.screen.height-60; var wwidth=window.screen.width; @@ -8,18 +9,19 @@ /** * 实现刷新时间的方法,并且判断了用户是否手动修改了时间,如果是,则清除定时器(陈家儒改) + * @param extObject: ext对象,top.Ext或者top.Ext4或者Ext * @param datefieldWithMinId: 时间选项框的id * @param refreshFrequency: 时间刷新的频率 * */ function refreshTime(datefieldWithMinId, refreshFrequency) { - var time = top.Ext.getCmp(datefieldWithMinId).getValue().getTime(); + var time = $extObject.getCmp(datefieldWithMinId).getValue().getTime(); if (time == $lastTime) { // if (refreshFrequency) { //测试用的 // $lastTime = time + 60000; // } $lastTime = time + refreshFrequency; - top.Ext.getCmp(datefieldWithMinId).setValue(new Date($lastTime)); + $extObject.getCmp(datefieldWithMinId).setValue(new Date($lastTime)); } else { //如果上一分钟和下一分钟的时间戳不一样,清除定时器 clearInterval($refreshStartDateHandle); } @@ -28,22 +30,24 @@ /** * 设置"开始时间"的方法,以服务器的时间为准(陈家儒改) - * @param format: 时间的格式 + * @param extObject: ext对象,top.Ext或者top.Ext4或者Ext + * @param format: 时间的格式(例如:yyyy/MM/dd HH:mm:ss) * @param datefieldWithMinId: 时间选项框的id * @param refreshFrequency: 时间刷新的频率 * @param refresh: 是否需要刷新 * */ -function setStartDate(format, datefieldWithMinId, refreshFrequency, refresh) { - Ext.Ajax.request({ +function setStartDate(extObject, format, datefieldWithMinId, refreshFrequency, refresh) { + $extObject = extObject; + $extObject.Ajax.request({ url : WWWROOT + '/system/serverTimeAction!getServerDateTime.do', params : {dateformat : format}, success : function(response, options) { - var result = Ext.decode(response.responseText); + var result = $extObject.decode(response.responseText); if(result.success){ var serverTime = result.serverTime; - top.Ext.getCmp(datefieldWithMinId).setValue(new Date(serverTime)); - $lastTime = top.Ext.getCmp(datefieldWithMinId).getValue().getTime(); + $extObject.getCmp(datefieldWithMinId).setValue(new Date(serverTime)); + $lastTime = $extObject.getCmp(datefieldWithMinId).getValue().getTime(); if (refresh) { $refreshStartDateHandle = setInterval("refreshTime('" + datefieldWithMinId + "', " + refreshFrequency + ")", refreshFrequency); } Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r15227 -r15482 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 15227) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 15482) @@ -1099,6 +1099,9 @@ items : [ formObj ] }); washAndDisinfectRecordWin.show(); + washAndDisinfectRecordWin.on('close', function() { //关闭窗口就清除定时器 + clearInterval($refreshStartDateHandle); + }); formObj.form.load({ url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!loadWashAndDisinfectRecord.do', @@ -1107,10 +1110,7 @@ success : function(form, action) { //流水号初始化 if(id == 0){ - //top.Ext.getCmp('washingMode').setValue(washMachine); - //默认当前时间为开始日期 - var d = new Date(); - top.Ext.getCmp("startDateStr").setValue(d); + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm:ss', 'startDateStr', 1000, true); //(设置开始时间,取服务器时间,并且每秒刷新一下。cjr) top.Ext.getCmp('inputText').focus(true); // 默认不显示循环次数输入框 top.Ext.getCmp('cycleCounterId').hide();