Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js =================================================================== diff -u -r26110 -r26112 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26110) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26112) @@ -15,6 +15,14 @@ var zoomRatio = 1; var actualWidth = window.screen.availWidth; var actualHeight = window.screen.availHeight; + var windowH = window.screen.height; + var windowW = window.screen.width; + if(windowW == 1280 && windowH == 1024){ + $(".mbody_02,.mbody,#mbody").addClass("on"); + } + if(windowW == 1024 && windowH == 768){ + $(".mbody_02,.mbody,#mbody").addClass("on_1024"); + } if(_actualWidth != undefined){ actualWidth = _actualWidth; } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css =================================================================== diff -u -r26110 -r26112 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css (.../expressStyle.css) (revision 26110) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css (.../expressStyle.css) (revision 26112) @@ -222,4 +222,73 @@ .num-ten .search .btn-a:hover{ background-position:-140px -755px;} .num-ten .search .btn-b{background:url(pic_bg.jpg) no-repeat -248px -691px; width:103px; height:62px; border:none} .num-ten .search .btn-b:hover{ background-position:-248px -755px;} -.num-ten .search table{ margin:0 auto} \ No newline at end of file +.num-ten .search table{ margin:0 auto} +.mbody.on{ + height: 1439px; + background:url(express_recycle_08.png); + margin-top: 7px; +} +.mbody.on .data-table{ + height:948px; + bottom: 153px; +} +.mbody.on .data-table .box{ + height: 948px; +} +.mbody.on .zhuangzai-table{ + height: 1043px; +} +.mbody.on .zhuangzai-table .box{ + height: 1027px; +} +/* 1024*768 */ +.mbody.on_1024{ + background:url(express_recycle_102402.png) no-repeat; + height:1319px; + margin-top: 9px; +} +.mbody.on_1024 .data-table{ + height:818px; + bottom: 170px; +} +.mbody.on_1024 .data-table .box{ + height:818px; +} +.mbody.on_1024 .zhuangzai-table{ + height: 890px; + bottom:92px; +} +.mbody.on_1024 .zhuangzai-table .box{ + height: 890px; +} +#mbody.on{ + height:1438px; + background:url(express_into_basket_10.png) no-repeat; + margin-top: 7px; +} +#mbody.on #boxContent{ + bottom: 391px; +} +#mbody.on .data-table,#mbody.on_1024 .data-table{ + margin-top:0; +} +#mbody.on_1024 .data-table{ + bottom: 283px; +} +#mbody.on .data-table .box{ + height: 760px; +} +#mbody.on #box{ + top: 26%; +} +#mbody.on_1024{ + height:1320px; + background: url(express_into_basket_10_1024.png) no-repeat; + margin-top: 7px; +} +#mbody.on_1024 #box{ + top:28%; +} +#mbody.on_1024 .data-table .box{ + height:741px; +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css =================================================================== diff -u -r26110 -r26112 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 26110) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 26112) @@ -209,4 +209,40 @@ .his_item .page .next{ background-position:-98px -186px} .his_item .page .next:hover{ background-position:-98px -230px} .his_item .page .last{ background-position:-147px -186px} -.his_item .page .last:hover{ background-position:-147px -230px} \ No newline at end of file +.his_item .page .last:hover{ background-position:-147px -230px} +/* 1280*1024 */ +.mbody_02.on{ + height:1439px; + background:url(body_bg_02_01.png) no-repeat; +} +.mbody_02.on .wait_item .scroll{ + height:1143px; +} +.mbody_02.on .his_item{ + height:1106px; +} +.mbody_02.on .his_item .scroll{ + height:1056px; +} +.mbody_02.on .his_item .page{ + bottom:-125px; + background: #fff; + left:-4px; +} +/* 1024*768 */ +.mbody_02.on_1024{ + height: 1320px; + background:url(body_bg_02_1024.png) no-repeat; +} +.mbody_02.on_1024 .wait_item .scroll{ + height: 1038px; +} +.mbody_02.on_1024 .his_item{ + height: 1129px; +} +.mbody_02.on_1024 .his_item .scroll{ + height: 957px; +} +.mbody_02.on_1024 .his_item .page{ + bottom: 5px; +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r26110 -r26112 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 26110) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 26112) @@ -430,3 +430,42 @@ cursor: pointer; margin-top:5px; } +.mbody.on{ + background:url(body_bg_07.png) no-repeat; + height:1440px; + margin-top: -6px; +} +.mbody.on .data-table{ + bottom: 515px; +} +.mbody.on .data-table .box{ + height: 796px; +} +.mbody.on .zhuangzai-table{ + height: 1066px; +} +.mbody.on .zhuangzai-table .box{ + height: 1085px; +} +.mbody.on .copyRight,.mbody.on_1024 .copyRight{ + bottom:8px; +} +/* 1024*768 */ +.mbody.on_1024{ + background:url(body_bg_102401.png) no-repeat; + height:1319px; + margin-top:-5px; +} +.mbody.on_1024 .data-table{ + bottom: 390px; +} +.mbody.on_1024 .data-table .box{ + height:694px; +} +.mbody.on_1024 .zhuangzai-table{ + height: 1048px; + bottom: 70px; +} +.mbody.on_1024 .zhuangzai-table .box{ + height: 1048px; +} \ No newline at end of file