Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r28595 -r28596 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28595) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28596) @@ -4955,22 +4955,35 @@ inactivityTime(); }); +var inactivityTimes = function () { + var t; + + function resetTimer() { + clearInterval(t); + t = setInterval(function(){ + var title = window.localStorage.getItem('title'); + if(title.indexOf('装配')>-1){ + if(pageLoad){ + websocketCallBacks(); + pageLoad = false; + } + } + }, 1000) + } + + resetTimer(); +}; + /** * websocket的业务回调函数(将需要处理的业务写在此函数中) */ var pageLoad = false; -document.addEventListener('mouseover',function(){ - if(pageLoad){ - websocketCallBacks(); - pageLoad = false; - } -}) +inactivityTimes(); + function websocketCallBack(){ pageLoad = true; - websocketCallBacks(); } - function websocketCallBacks(){ //刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新) var basketBarcodeArrAll = basketBarcodeArr2; Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r28595 -r28596 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28595) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28596) @@ -141,32 +141,6 @@ body { overflow: hidden; } -#waitPackingTreeGrid .x4-toolbar,#basketTreeGrid .x4-toolbar { - width: 100% !important; -} -#waitPackingTreeGrid .x4-grid-header-ct,#basketTreeGrid .x4-grid-header-ct { - width: 100% !important; - top: 26px !important; -} -#waitPackingTreeGrid-body,#basketTreeGrid-body { - width: 100% !important; - top: 50px !important; -} -#waitPackingTreeGrid-body,#waitPackingTreeGrid .x4-tree-view,#basketTreeGrid-body,#basketTreeGrid .x4-tree-view { - width: 100% !important; -} -#waitPackingTreeGrid .x4-grid .x4-box-inner,#basketTreeGrid .x4-grid .x4-box-inner, -#waitPackingTreeGrid .x4-toolbar .x4-box-inner,#waitPackingTreeGrid .x4-grid-header-ct .x4-box-inner, -#basketTreeGrid .x4-grid-header-ct .x4-box-inner,#basketTreeGrid .x4-toolbar .x4-box-inner{ - width: 100% !important; - height: 23px !important; -} -#dockedItems { - height: auto !important; -} -#waitPackingTreeGrid .x4-box-target,#basketTreeGrid .x4-box-target { - width: 100% !important; -}