Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js =================================================================== diff -u -r12688 -r36590 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js (.../divselect.js) (revision 12688) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js (.../divselect.js) (revision 36590) @@ -4,6 +4,23 @@ var ul = $(divselectid+" ul"); if(ul.css("display")=="none"){ ul.slideDown("fast"); + if(divselectid == '#divselect'){ + $("#divTousseGroup ul").hide(); + $("#divDepartGroupSelect ul").hide(); + $("#divStatusSelect ul").hide(); + }else if(divselectid == '#divTousseGroup'){ + $("#divselect ul").hide(); + $("#divDepartGroupSelect ul").hide(); + $("#divStatusSelect ul").hide(); + }else if(divselectid == '#divDepartGroupSelect'){ + $("#divselect ul").hide(); + $("#divTousseGroup ul").hide(); + $("#divStatusSelect ul").hide(); + }else if(divselectid == '#divStatusSelect'){ + $("#divselect ul").hide(); + $("#divTousseGroup ul").hide(); + $("#divDepartGroupSelect ul").hide(); + } }else{ ul.slideUp("fast"); } @@ -16,7 +33,6 @@ var value = $(this).attr("selectid"); inputselect.val(value); $(divselectid+" ul").hide(); - }); $(document).click(function(){ $(divselectid+" ul").hide(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r35710 -r36590 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 35710) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 36590) @@ -140,27 +140,27 @@ padding-left:4px; padding-right:30px; border:1px solid #333333; background:url(xjt.png) no-repeat right center; } -#divselect{width:260px; margin:0px 230px auto; position:relative; z-index:10000;top: 2px;} -#divselect cite{width:225px;} +#divselect,#divDepartGroupSelect{width:145px; position:relative; z-index:10000;top: 2px;left: 230px;} +#divselect cite,#divDepartGroupSelect cite{width:110px;} #divselect ul{width:260px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;} #divselect ul li{height:60px; line-height:60px;} #divselect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} #divselect ul li a:hover{background-color:#CCC;} -#divStatusSelect,#divDepartGroupSelect{width:210px; margin:0px 230px auto; position:relative; z-index:10000;top: 2px;left: 0;} -#divStatusSelect cite,#divDepartGroupSelect cite{width:160px;} +#divStatusSelect{width:145px; margin:0px 170px auto; position:relative; z-index:10000;top: 2px;left: 0;} +#divStatusSelect cite{width:110px;} #divStatusSelect ul,#divDepartGroupSelect ul{width:194px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;} #divStatusSelect ul li,#divDepartGroupSelect ul li{height:60px; line-height:60px;} #divStatusSelect ul li a,#divDepartGroupSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} #divStatusSelect ul li a:hover,#divDepartGroupSelect ul li a:hover{background-color:#CCC;} #divStatusSelect { - left: 195px; + left: 205px; top: -45px; } -#divTousseGroup{width:180px; margin:-45px 490px auto; position:relative; z-index:10000;} -#divTousseGroup cite{width:180px;} +#divTousseGroup{width:145px; position:relative; z-index:10000;top: -45px;left: 375px;} +#divTousseGroup cite{width:110px;} #divTousseGroup ul{width:214px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;} #divTousseGroup ul li{height:60px; line-height:60px;} #divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} @@ -400,7 +400,7 @@