Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js =================================================================== diff -u -r28599 -r28607 --- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 28599) +++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 28607) @@ -1619,7 +1619,7 @@ errorAmount : 0, damageAmount : 0, unWashAmount : 0, - tousseAmount : item.tousseAmount, + tousseAmount : item.tousseAmount }] waitComboTousseGridStore.insert(0,addItem); continue; Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r28600 -r28607 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28600) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28607) @@ -4990,8 +4990,14 @@ }else{ span.innerText = text; } - result.width = parseFloat(window.getComputedStyle(span).width) - result.width; - result.height = parseFloat(window.getComputedStyle(span).height) - result.height; + if(window.getComputedStyle){ + result.width = parseInt(window.getComputedStyle(span).width) - result.width; + result.height = parseInt(window.getComputedStyle(span).height) - result.height; + }else{ + //针对IE9以下兼容 + result.width = parseInt(span.offsetWidth) - result.width; + result.height = parseInt(span.offsetHeight) - result.height; + } return result; }