Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r20372 -r20376 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 20372) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 20376) @@ -650,7 +650,7 @@ $("#startDate").val(today); $("#endDate").val(today); } - + setInterval("refreshBasket()",1000*60*2);//定时刷新(2分钟一次) } //待装载篮筐器的器械包材料 Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css =================================================================== diff -u -r20373 -r20376 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css (.../washformstyle.css) (revision 20373) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css (.../washformstyle.css) (revision 20376) @@ -110,16 +110,16 @@ .zhuangzai-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer} .zhuangzai-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer} .zhuangzai-table .sed{ display:none} -.zhuangzai-table .list-item li{ padding:0px;font-size:30px; color:#666; line-height:70px; width:530px; } +.zhuangzai-table .list-item li{background:url(table4_bg.gif) no-repeat top center; padding:0px;font-size:30px; color:#666; line-height:70px; width:530px; } .zhuangzai-table .list-item li em{ width:85px; text-align:center;} -.zhuangzai-table .list-item li i{ width:106px; text-align:center;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:3.5px 1px;} +.zhuangzai-table .list-item li i{ width:106px; text-align:center;} .zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto} .zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; } .zhuangzai-table .list-item dl{ margin-top:7px; width:530px; background:#f9fce8; } .zhuangzai-table .list-item dd{ float:left; border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; } .zhuangzai-table .list-item .name{ width:333px;height:58px;line-height:25px;overflow:hidden;} -.zhuangzai-table .list-item .basketName{ padding-left:0;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 51px;} -.zhuangzai-table .list-item .amount{ padding-left:120px;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 40px;} +.zhuangzai-table .list-item .basketName{ padding-left:0;} +.zhuangzai-table .list-item .amount{ padding-left:120px;} .zhuangzai-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;} .zhuangzai-table .list-item .num{ width:89px;height:58px;line-height:25px;overflow:hidden;} .zhuangzai-table .list-item .del{ width:101px;height:58px;} @@ -132,17 +132,17 @@ .qingxi-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block;cursor:pointer} .qingxi-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block;cursor:pointer} .qingxi-table .sed{ display:none} -.qingxi-table .list-item li{ padding:8px 0px 7px 0px;font-size:30px; color:#666; line-height:58px;} +.qingxi-table .list-item li{ background:url(table3_bg.gif) no-repeat top center; padding:8px 0px 7px 0px;font-size:30px; color:#666; line-height:58px;} .qingxi-table .list-item li em{ width:85px; text-align:center;} -.qingxi-table .list-item li i{ width:103px; text-align:center;border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:0.2px 0.23px;} -.qingxi-table .list-item li font{ padding-left:40px; border-bottom:1px solid #ddd;border-right:1px solid #ddd;padding:10px 0px;} +.qingxi-table .list-item li i{ width:103px; text-align:center;} +.qingxi-table .list-item li font{ padding-left:40px;} .qingxi-table .list-item li .btn{ background:url(btn_send.jpg) no-repeat top center; background-size:40px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0} .qingxi-table .list-item li .btn:hover{ background:url(btn_send.jpg) no-repeat top center; background-size:30px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto; padding-left:0 } .qingxi-table .list-item dl{ margin-top:7px; width:800px; background:#f9fce8; } .qingxi-table .list-item dd{ float:left; border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; } .qingxi-table .list-item .name{ width:302px;height:58px;line-height:25px;overflow:hidden;} .qingxi-table .list-item .barcode{ padding-left:13px;} -.qingxi-table .list-item .basketName{ padding-left:115px;} +.qingxi-table .list-item .basketName{ padding-left:50px;} .qingxi-table .list-item .code{ width:193px;} .qingxi-table .list-item .amount{ padding-left:87px;} .qingxi-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/table4_bg.gif =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/table3_bg.gif =================================================================== diff -u Binary files differ