Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js =================================================================== diff -u -r15313 -r15523 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 15313) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 15523) @@ -958,7 +958,7 @@ fieldLabel : '抽检时间', id : 'dateTime', name : 'dateTime', - value : new Date(), +// value : new Date(), editable : false, format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', @@ -1520,6 +1520,7 @@ } }); }else{ + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime'); //(设置抽检时间,取服务器时间 cjr) disableRecycleAndRepacking(); var resonPart = top.Ext.getCmp('responsibilityPart').getValue(); if(resonPart != null && resonPart != '') { Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js =================================================================== diff -u -r12331 -r15523 --- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js (.../problemReportForm.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js (.../problemReportForm.js) (revision 15523) @@ -60,12 +60,17 @@ fieldLabel : '报告日期', id : 'reportTime', name : 'reportTime', - value : new Date(), +// value : new Date(), editable : false, readOnly : true, format : 'Y-m-d H:i', allowBlank : false, - anchor : '95%' + anchor : '95%', + listeners : { + render : function() { + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'reportTime'); //(设置报告日期,取服务器时间 cjr) + } + } },{ xtype : 'hidden', name : 'datetime', Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r15079 -r15523 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 15079) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 15523) @@ -572,7 +572,7 @@ fieldLabel : '抽检时间', id : 'dateTime2', name : 'dateTime', - value : new Date(), +// value : new Date(), editable : false, format : 'Y-m-d H:i', allowBlank : false, @@ -801,6 +801,7 @@ } }); }else{ + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime2'); //(设置抽检时间,取服务器时间 cjr) inspectItemStore.load(); } } @@ -957,7 +958,7 @@ fieldLabel : '监测时间', id : 'dateTime', name : 'dateTime', - value : new Date(), +// value : new Date(), editable : false, altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', format : 'Y-m-d H:i', @@ -1398,6 +1399,7 @@ } }); }else{ + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime'); //(设置监测时间,取服务器时间 cjr) disableRecycleAndRepacking(); inspectItemStore.load(); } Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallDiposableGoods.js =================================================================== diff -u -r15422 -r15523 --- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallDiposableGoods.js (.../recallDiposableGoods.js) (revision 15422) +++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallDiposableGoods.js (.../recallDiposableGoods.js) (revision 15523) @@ -233,7 +233,7 @@ editable:false, allowBlank: false, format:'Y-m-d H:i', - value: new Date(), +// value: new Date(), anchor : '95%' }] }, { @@ -320,6 +320,8 @@ }, failure : function(form, action) {} }); + } else { + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'publishDate'); //(设置 发布时间,取服务器时间 cjr) } recallRecordWin = new top.Ext.Window( { Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r15482 -r15523 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15482) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 15523) @@ -1,63 +1,59 @@ $refreshStartDateHandle = null; //定时器的句柄(陈家儒改) -$lastTime = 0; //定时器的上一分钟的时间戳 -$extObject = null; //ext对象: var bPageModified=false; var wheight=window.screen.height-60; var wwidth=window.screen.width; var openReturnValue=""; var webCtxRoot = ''; -/** - * 实现刷新时间的方法,并且判断了用户是否手动修改了时间,如果是,则清除定时器(陈家儒改) - * @param extObject: ext对象,top.Ext或者top.Ext4或者Ext - * @param datefieldWithMinId: 时间选项框的id - * @param refreshFrequency: 时间刷新的频率 - * - */ -function refreshTime(datefieldWithMinId, refreshFrequency) { - var time = $extObject.getCmp(datefieldWithMinId).getValue().getTime(); - if (time == $lastTime) { -// if (refreshFrequency) { //测试用的 -// $lastTime = time + 60000; -// } - $lastTime = time + refreshFrequency; - $extObject.getCmp(datefieldWithMinId).setValue(new Date($lastTime)); - } else { //如果上一分钟和下一分钟的时间戳不一样,清除定时器 - clearInterval($refreshStartDateHandle); - } -} - /** * 设置"开始时间"的方法,以服务器的时间为准(陈家儒改) * @param extObject: ext对象,top.Ext或者top.Ext4或者Ext * @param format: 时间的格式(例如:yyyy/MM/dd HH:mm:ss) * @param datefieldWithMinId: 时间选项框的id - * @param refreshFrequency: 时间刷新的频率 - * @param refresh: 是否需要刷新 + * @param refreshFrequency: 时间刷新的频率(可选) + * @param refresh: 是否需要刷新(可选) * */ function setStartDate(extObject, format, datefieldWithMinId, refreshFrequency, refresh) { - $extObject = extObject; - $extObject.Ajax.request({ + + extObject.Ajax.request({ url : WWWROOT + '/system/serverTimeAction!getServerDateTime.do', params : {dateformat : format}, success : function(response, options) { - var result = $extObject.decode(response.responseText); + var result = extObject.decode(response.responseText); if(result.success){ var serverTime = result.serverTime; - $extObject.getCmp(datefieldWithMinId).setValue(new Date(serverTime)); - $lastTime = $extObject.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); + $refreshStartDateHandle = setInterval(function() { + var time = extObject.getCmp(datefieldWithMinId).getValue().getTime(); + if (time == lastTime) { +// if (refreshFrequency) { //测试用的 +// lastTime = time + 60000; +// } + lastTime = time + refreshFrequency; + extObject.getCmp(datefieldWithMinId).setValue(new Date(lastTime)); + } else { //如果上一秒或者分钟和下一秒或者分钟的时间戳不一样,清除定时器 + clearInterval($refreshStartDateHandle); + } + }, refreshFrequency); } } }, failure : function(response, options) { alert('获取服务器时间失败'); } }); + } + + + + + + /** * 获取服务器时间 * @param format 时间格式