Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r26778 -r26854 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 26778) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 26854) @@ -434,6 +434,7 @@ background:url(body_bg_07.png) no-repeat; height:1440px; margin-top: -6px; + margin-left:0; } .mbody.on .data-table{ bottom: 515px; @@ -445,17 +446,21 @@ height: 1066px; } .mbody.on .zhuangzai-table .box{ - height: 1085px; + height: 1181px; } .mbody.on .copyRight,.mbody.on_1024 .copyRight{ bottom:8px; } +.mbody.on .zhuangzai-table .list-item .barcode{width: 161px;} +.mbody.on .zhuangzai-table{bottom: 175px;right: 112px;} /* 1024*768 */ .mbody.on_1024{ background:url(body_bg_102401.png) no-repeat; height:1319px; margin-top:-5px; + margin-left: 0px; } + .mbody.on_1024 .data-table{ bottom: 390px; } @@ -468,4 +473,55 @@ } .mbody.on_1024 .zhuangzai-table .box{ height: 1048px; -} \ No newline at end of file +} +/* 1280*720 */ +.mbody.on1280_7{ + background:url(body_bg12807.png) no-repeat; + height:1043px; + width:2032px; + margin-left: 0px; +} +.mbody.on1280_7 .zhuangzai-table .list-item li{ background:url(table_bg1920.gif) no-repeat top center;} +.mbody.on1280_7 .zhuangzai-table{width: 659px;bottom: 152px;right: 58px;} +.mbody.on1280_7 .zhuangzai-table .box{height: 778px;} +.mbody.on1280_7 .data-table{bottom:107px;} +.mbody.on1280_7 .data-table .box{height:455px;} +.mbody.on1280_7 .btn-h{margin-left:875px;margin-top:360px;} +.mbody.on1280_7 .zhuangzai-table .list-item .barcode{width: 180px;} +.mbody.on1280_7 .zhuangzai-table .list-item .num{width: 91px;} +.mbody.on1280_7 .add-form .addQM,.mbody.on1280_7 .add-form .add,.mbody.on1280_7 .add-form .add2{margin-top:163px;} +/* 1280*800 */ +.mbody.on1280_8{height: 1105px;background:url(body_bg12808.png) no-repeat;margin-left:0;} +.mbody.on1280_8 .zhuangzai-table{right: 112px;bottom: 204px;} +.mbody.on1280_8 .zhuangzai-table .list-item .barcode{width: 161px;} +/* 1366*768 */ +.mbody.on_1366{width: 2026px;height: 1045px;background:url(body_bg1366.png) no-repeat;margin-left: 0;} +.mbody.on_1366 .btn-h{margin-left: 881px;margin-top: 367px;} +.mbody.on_1366 .data-table{bottom:107px;} +.mbody.on_1366 .data-table .box{height:455px;} +.mbody.on_1366 .zhuangzai-table{width: 659px;bottom: 153px;right: 59px;} +.mbody.on_1366 .zhuangzai-table .box{height: 778px;} +.mbody.on_1366 .zhuangzai-table .list-item li{ background:url(table_bg1600.gif) no-repeat top center;} +.mbody.on_1366 .add-form .addQM,.mbody.on_1366 .add-form .add,.mbody.on_1366 .add-form .add2{margin-top:163px;} +.mbody.on_1366 .zhuangzai-table .list-item .barcode{width: 182px;} +.mbody.on_1366 .zhuangzai-table .list-item .num{width:90px;} +/* 1600*900 */ +.mbody.on_1600{width: 2009px;height: 1051px;background:url(body_bg1600.png) no-repeat;margin-left: 0;} +.mbody.on_1600 .btn-h{margin-left: 881px;margin-top: 367px;} +.mbody.on_1600 .data-table{bottom:107px;} +.mbody.on_1600 .data-table .box{height:455px;} +.mbody.on_1600 .zhuangzai-table{width: 659px;bottom: 162px;right: 56px;} +.mbody.on_1600 .zhuangzai-table .box{height: 778px;} +.mbody.on_1600 .add-form .addQM,.mbody.on_1600 .add-form .add,.mbody.on_1600 .add-form .add2{margin-top:163px;} +.mbody.on_1600 .zhuangzai-table .list-item li{ background:url(table_bg1600.gif) no-repeat top center;} +.mbody.on_1600 .zhuangzai-table .list-item .num{width: 91px;} +.mbody.on_1600 .zhuangzai-table .list-item .name{width: 256px;} +/* 1920*1080 */ +.mbody.on_1920{width: 1992px;background:url(body_bg1920.png) no-repeat;margin-left:0;} +.mbody.on_1920 .btn-h{margin-left: 863px;} +.mbody.on_1920 .zhuangzai-table{width: 653px;bottom: 182px;right: 55px;} +.mbody.on_1920 .zhuangzai-table .box{height: 817px;} +.mbody.on_1920 .zhuangzai-table .list-item .barcode{width: 167px;} +.mbody.on_1920 .zhuangzai-table .list-item .name{width: 245px;} +.mbody.on_1920 .zhuangzai-table .list-item li{ background:url(table_bg1920.gif) no-repeat top center;} +.mbody.on_1920 .zhuangzai-table .list-item .num{width: 90px;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg_0212808.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css =================================================================== diff -u -r26112 -r26854 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 26112) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 26854) @@ -210,10 +210,49 @@ .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} +/* 1280*720 */ +.mbody_02.on1280_7{ + width:2030px; + height:1043px; + background:url(body_bg_0212807.png) no-repeat; +} +.mbody_02.on1280_7 .filter{ + height:45px; + line-height: 45px; + margin-left:12px; +} +.mbody_02.on1280_7 #divTousseGroup{margin:-47px 480px auto;} +.mbody_02.on1280_7 .wait_item .scroll,.mbody_02.on1280_7 .his_item .scroll{top:95px;} +.mbody_02.on1280_7 .his_item .scroll{left:-59px;width:1002px;} +.mbody_02.on1280_7 .wait_item .scroll{height:764px;width:1001px;} +.mbody_02.on1280_7 #awaitForRecycleTable{width:980px !important;} +.mbody_02.on1280_7 #recyclingRecordTable{width:980px !important;} +.mbody_02.on1280_7 .td_w{width:140px !important;} +.mbody_02.on1280_7 .record_td{width:200px !important;} +.mbody_02.on1280_7 .his_item .page{bottom:49px;left:-91px;} +/* 1280*800 */ +.mbody_02.on1280_8{height: 1105px;background:url(body_bg_0212808.png) no-repeat;} +.mbody_02.on1280_8 .wait_item .scroll{top: 106px;left: -10px;} +/* 1366*768 */ +.mbody_02.on_1366{width: 2026px;height: 1045px;background:url(body_bg_021366.png) no-repeat;} +.mbody_02.on_1366 .filter{ + height:45px; + line-height: 45px; + margin-left:12px; +} +.mbody_02.on_1366 #divTousseGroup{margin:-47px 480px auto;} +.mbody_02.on_1366 .wait_item .scroll,.mbody_02.on_1366 .his_item .scroll{top:95px;} +.mbody_02.on_1366 .his_item .scroll{left:-57px;width:1002px;} +.mbody_02.on_1366 .wait_item .scroll{height: 766px;width:1001px;left: -12px;} +.mbody_02.on_1366 #awaitForRecycleTable{width:980px !important;} +.mbody_02.on_1366 #recyclingRecordTable{width:980px !important;} +.mbody_02.on_1366 .td_w{width:140px !important;} +.mbody_02.on_1366 .record_td{width:200px !important;} +.mbody_02.on_1366 .his_item .page{bottom:49px;left:-91px;} /* 1280*1024 */ .mbody_02.on{ - height:1439px; - background:url(body_bg_02_01.png) no-repeat; + height:1443px; + background:#cbcbcb url(body_bg_02_01.png) no-repeat; } .mbody_02.on .wait_item .scroll{ height:1143px; @@ -231,8 +270,8 @@ } /* 1024*768 */ .mbody_02.on_1024{ - height: 1320px; - background:url(body_bg_02_1024.png) no-repeat; + height: 1321px; + background:#cbcbcb url(body_bg_02_1024.png) no-repeat; } .mbody_02.on_1024 .wait_item .scroll{ height: 1038px; @@ -245,4 +284,28 @@ } .mbody_02.on_1024 .his_item .page{ bottom: 5px; -} \ No newline at end of file +} +/* 1600*900 */ +.mbody_02.on_1600{width: 2009px;height: 1051px;background:url(body_bg_021600.png) no-repeat;} +.mbody_02.on_1600 .filter{ + height:45px; + line-height: 45px; + margin-left:12px; +} +.mbody_02.on_1600 #divTousseGroup{margin:-47px 480px auto;} +.mbody_02.on_1600 .wait_item .scroll,.mbody_02.on_1600 .his_item .scroll{top:95px;} +.mbody_02.on_1600 .his_item .scroll{left:-48px;width:993px;} +.mbody_02.on_1600 .wait_item .scroll{height: 766px;width:991px;} +.mbody_02.on_1600 #awaitForRecycleTable{width:974px !important;} +.mbody_02.on_1600 #recyclingRecordTable{width:974px !important;} +.mbody_02.on_1600 .td_w{width:140px !important;} +.mbody_02.on_1600 .record_td{width:180px !important;} +.mbody_02.on_1600 .his_item .page{bottom:49px;left:-83px;} +/* 1920*1080 */ +.mbody_02.on_1920{width: 1992px;background:url(body_bg_021920.png) no-repeat;} +.mbody_02.on_1920 .his_item .scroll{left: -40px;width:989px;} +.mbody_02.on_1920 .wait_item .scroll{height: 766px;width:989px;left: -13px;} +.mbody_02.on_1920 #awaitForRecycleTable{width:972px !important;} +.mbody_02.on_1920 #recyclingRecordTable{width:972px !important;} +.mbody_02.on_1920 .td_w{width:119px !important;} +.mbody_02.on_1920 .record_td{width:173px !important;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg_02_01.png =================================================================== diff -u -r26099 -r26854 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js =================================================================== diff -u -r26112 -r26854 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26112) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26854) @@ -17,12 +17,35 @@ var actualHeight = window.screen.availHeight; var windowH = window.screen.height; var windowW = window.screen.width; + + if(windowW == 1024 && windowH == 768){ + $(".mbody_02,.mbody,#mbody").addClass("on_1024"); + } + if(windowW == 1280 && windowH == 1024){ $(".mbody_02,.mbody,#mbody").addClass("on"); } - if(windowW == 1024 && windowH == 768){ - $(".mbody_02,.mbody,#mbody").addClass("on_1024"); + + if(windowW == 1280 && windowH == 720){ + $(".mbody_02,.mbody").addClass("on1280_7"); } + + if(windowW == 1280 && windowH == 800){ + $(".mbody_02,.mbody").addClass("on1280_8"); + } + + if(windowW == 1366 && windowH == 768){ + $(".mbody_02,.mbody").addClass("on_1366"); + } + + if(windowW == 1600 && windowH == 900){ + $(".mbody_02,.mbody").addClass("on_1600"); + } + + if(windowW == 1920 && windowH == 1080){ + $(".mbody_02,.mbody").addClass("on_1920"); + } + if(_actualWidth != undefined){ actualWidth = _actualWidth; } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg_021920.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg12808.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg_021600.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/table_bg1920.gif =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasket128010.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasket1920.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r23648 -r26854 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 23648) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 26854) @@ -57,7 +57,7 @@ //如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题 - +