Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r28589 -r28595 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28589) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28595) @@ -4354,7 +4354,8 @@ xtype: 'toolbar', dock: 'bottom', padding:'0 0 0 0', - border:false, + border:false, + id : 'dockedItems', items: [{ id : 'addErrorMaterial', text: "补充丢失器械", @@ -4390,7 +4391,9 @@ xtype: 'toolbar', dock: 'bottom', padding:'0 0 0 0', - border:false, + border:false, + id : 'dockedItemsHidden', + hidden:!sstsConfig.tousseSizeColor, items: [ { id : 'superBigTousse', @@ -4955,7 +4958,20 @@ /** * websocket的业务回调函数(将需要处理的业务写在此函数中) */ +var pageLoad = false; + +document.addEventListener('mouseover',function(){ + if(pageLoad){ + websocketCallBacks(); + pageLoad = false; + } +}) function websocketCallBack(){ + pageLoad = true; + websocketCallBacks(); +} + +function websocketCallBacks(){ //刷新装配和待装配任务列表(须参考需求的预期结果进行前端业务的开发:ZSWY-110 多人同时进行装配和审核时界面上的待处理任务要自动实时刷新) var basketBarcodeArrAll = basketBarcodeArr2; if(basketBarcodeArrAll.length > 0){ @@ -5114,13 +5130,11 @@ } } speakBasket.speakContent(); - }, + }, failure : function(){myMask.hide();} }); } }else{ reflushWaitPackingTreeGrid(); - } - // getErrorAndDamgeCount(); - + } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r28565 -r28595 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28565) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28595) @@ -141,6 +141,32 @@ 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; +}