Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js =================================================================== diff -u -r12331 -r16177 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 16177) @@ -23,6 +23,7 @@ } zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); if(zoomRatio != 1){ +// alert('designedWidth='+designedWidth+',designedHeight='+designedHeight+',actualWidth='+actualWidth+',actualHeight='+actualHeight+',zoomRatio='+zoomRatio) document.body.style.zoom = zoomRatio; } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css =================================================================== diff -u -r16173 -r16177 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 16173) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 16177) @@ -172,19 +172,19 @@ .mbody_02 .back{ position:absolute; left:40px; top:25px;} .mbody_02 .back a{width:66px; height:43px; display:block; line-height:200px; overflow:hidden} .mbody_02 .back a:hover{ background-position:0 -46px;} -.wait_item{ width:967px; height:902px; position:absolute; left:14px; top:128px;} -.wait_item .add{position:absolute; right:20px; top:3px;} +.wait_item{ width:930px; height:902px; position:absolute; left:14px; top:128px;} +.wait_item .add{position:absolute; right:10px; top:3px;} .wait_item .add a{ width:104px; height:42px; display:block; background-position:0 -91px; overflow:hidden; line-height:200px;} .wait_item .add a:hover{ background-position:0 -136px;} .wait_item .th{ position:absolute; top:50px; height:49px; width:935px} .wait_item .th td{ font-family:"微软雅黑"; font-size:22px; color:#676767; text-align:center; line-height:49px; padding:0 5px} .wait_item .th td a{color:#676767;} .wait_item .th td .arrow{ background:url(arrow.gif) no-repeat 90px 14px; padding-right:20px;} .wait_item .th td .down{ background-position:90px -20px;} -.wait_item .scroll{ position:absolute; top:101px; width:965px; height:800px; left:2px; overflow-y:scroll} +.wait_item .scroll{ position:absolute; top:101px; width:950px; height:800px; left:2px; overflow-y:scroll} .wait_item .scroll td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; height:69px; font-family:"微软雅黑"; font-size:24px; color:#666; padding:0 5px} -.his_item{ width:967px; height:902px; position:absolute; right:16px; top:128px;} +.his_item{ width:950px; height:902px; position:absolute; right:0px; top:128px;} .his_item .add{position:absolute; right:20px; top:3px;} .his_item .add a{ width:104px; height:42px; display:block; background-position:0 -91px; overflow:hidden; line-height:200px;} .his_item .add a:hover{ background-position:0 -136px;} @@ -193,7 +193,7 @@ .his_item .th td a{color:#676767;} .his_item .th td .arrow{ background:url(arrow.gif) no-repeat 90px 14px; padding-right:20px;} .his_item .th td .down{ background-position:90px -20px;} -.his_item .scroll{ position:absolute; top:101px; width:965px; height:711px; left:2px; overflow-y:scroll} +.his_item .scroll{ position:absolute; top:101px; width:950px; height:711px; left:2px; overflow-y:scroll} .his_item .scroll td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; height:69px; font-family:"微软雅黑"; font-size:24px; color:#666; padding:0 5px} .his_item .page{ width:965px; bottom:20px; position:absolute} .his_item .page ul{ width:900px; margin:0 auto} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r16015 -r16177 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 16015) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 16177) @@ -325,7 +325,7 @@ } var departName = result.data[i].depart; - var recyclingRecordElement = $('