Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js =================================================================== diff -u -r15374 -r15432 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15374) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js (.../washForTouchScreen.js) (revision 15432) @@ -134,14 +134,17 @@ $(deleteButton).parent().parent().remove(); } -function createBasketUiElement(basketBarcode,classifyBasketId,basketName,itemsInfo){ +function createBasketUiElement(basketBarcode,classifyBasketId,basketName,position,itemsInfo){ var basketElement = '
  • '; basketElement += ''; basketElement += ''; basketElement += '删除'; basketElement += ''; basketElement += ''; basketElement += '' + basketName +''; + basketElement += '

    ' + position +'

    ';//位置 + +// element += '
    '+"为准"+'
    '; basketElement += '
    '; if(itemsInfo != null && itemsInfo.length > 0){ @@ -154,7 +157,7 @@ basketElement += '
    • '; var obj = $(basketElement); $("#basketsUl").prepend(obj); - var json = getBasketJSON(classifyBasketId,basketBarcode); + var json = getBasketJSON(classifyBasketId,basketBarcode,position); $("#basketsUl li:first").find('input').val(json); } function createBasketItem(goodsName,amount){ @@ -230,13 +233,23 @@ if(success){ var type = result.type; if(type == "containerStatus"){ + var position = ''; + if(sstsConfig.hasOwnProperty('wrRecordScanPosition') && sstsConfig.wrRecordScanPosition){ + if((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){ + position = $("#washPosition").val(); + if(position == null || position == ''){ + alertDiv("请先扫描位置！",false,false,false); + return; + } + } + } var basketName = result.data.container.name; var classifyBasketId = result.data.id; var basketBarcode = result.data.container.barcode; var itemsInfo = result.data.itemAmountInfos; var isExist = isBasketExist(classifyBasketId); if(!isExist){ - createBasketUiElement(basketBarcode,classifyBasketId,basketName,itemsInfo); + createBasketUiElement(basketBarcode,classifyBasketId,basketName,position,itemsInfo); $("#scanContainerBarcodeTipUl").hide(); barcodeGloble = '';//清空后清除条码记忆的全局变量 }else{ @@ -258,10 +271,16 @@ $("#personInCharge").val(result.data.fullName); $("#personInChargeCode").val(result.data.name); barcodeGloble = '';//清空后清除条码记忆的全局变量 + }else if(type == "position"){ + $("#washPosition").val(result.name); + barcodeGloble = '';//清空后清除条码记忆的全局变量 } - }else{ - alertDiv(result.error,false,false,false); + if(result.error != null && result.error != ''){ + alertDiv(result.error,false,false,false); + }else if(result.message != null && result.message != ''){ + alertDiv(result.message,false,false,false); + } } }, error:function(msg){ @@ -292,10 +311,11 @@ } } -function getBasketJSON(itemId,barcode){ +function getBasketJSON(itemId,barcode,position){ var json = {}; json.classifyBasketId = itemId; json.barcode = barcode; + json.position = position; return JSON.stringify(json); } @@ -375,7 +395,8 @@ classifyBasketInfo.push({ classifyBasketID : item.classifyBasketId, personInCharge : personInCharge, - personInChargeCode : personInChargeCode + personInChargeCode : personInChargeCode, + position : item.position }); }); return JSON.stringify(classifyBasketInfo); Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp =================================================================== diff -u -r15367 -r15432 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp (.../washForTouchScreen.jsp) (revision 15367) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp (.../washForTouchScreen.jsp) (revision 15432) @@ -6,6 +6,7 @@ <%@page import="java.util.Date"%> <%@page import="java.text.SimpleDateFormat"%> <%@page import="com.forgon.tools.SpringBeanManger"%> +<%@page import="com.forgon.disinfectsystem.common.*"%> <%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%> @@ -46,6 +47,14 @@ request.setAttribute("orgUnitCoding",orgUnitCoding); request.setAttribute("orgUnitName",orgUnitName); + boolean havePosition = CssdUtils.getSystemSetConfigByNameBool("haveRinserPosition"); + session.setAttribute("havePosition",havePosition); + if(havePosition == true){ + session.setAttribute("positionStyle", "display: block"); + }else{ + session.setAttribute("positionStyle", "display: none"); + } + //是否开启语音提示 boolean isNewMsgPromptSound = false; if(loginUser != null){ @@ -67,7 +76,12 @@ var personInChargeAllowBlank = getBoolValueFromJs('sstsConfig.washAndDisinfectRecordPersonInChargeAllowBlank',true); var defaultDisinfectIdentificationBarcode = getStrValueFromJs('sstsConfig.defaultDisinfectIdentificationBarcode',""); var defaultDisinfectProgramBarcode = getStrValueFromJs('sstsConfig.defaultDisinfectProgramBarcode',""); -document.write(''); + +if(${havePosition}){ + document.write(''); +}else{ + document.write(''); +} @@ -113,6 +127,8 @@
    +
    +
    Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle_position.css (revision 15432) @@ -0,0 +1,293 @@ +/*清除文档类型声明中的默认属性*/ +body {font-family:"微软雅黑",serif;font-size:12px; background:#fff; overflow:hidden;} +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,blockquote,p,table{padding:0; margin:0;} +table,td,tr,th{font-size:12px;} +li{list-style-type:none;} +fieldset,img{border:none; color:gray;} +ol,ul {list-style:none;} +h1,h2,h3,h4,h5,h6 {font-size:12px; font-weight:normal;} +q:before,q:after {content:'';} +abbr,acronym {border:0;} +address,caption,cite,code,dfn,em,th,var {font-weight:normal; font-style:normal;} +em,i{ float:right; font-family:Arial, Helvetica, sans-serif;} + +/*通用字体样式定义*/ +a {color:#000;text-decoration:none;} +a:visited {text-decoration:none;} +a:hover {color:#BA2636;text-decoration:underline;} +a:active {color:#BA2636;text-decoration:none;} +/*通用定义*/ +.clear{clear:both; height:0px; display:block; font-size:1px; overflow:hidden} +.clearfix:after {clear:both; height:0; overflow:hidden; display:block; visibility:hidden; content:"."; } +.left{ float:left;} +.right{ float:right;} +.blank5 {clear:both; height:5px; display:block; font-size:1px;overflow:hidden;} +.blank10 {clear:both; height:10px; display:block; font-size:1px;overflow:hidden;} +.blank15 {clear:both; height:15px; display:block; font-size:1px;overflow:hidden;} +.blank20 {clear:both; height:20px; display:block; font-size:1px;overflow:hidden;} +.blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;} + +.mbody{ background:url(washformbody_position_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative} +.add-form{ position:absolute; width:1980px; height:151px; top:140px; left:175px} +.add-form div{ position:absolute;} +.add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;} +.add-form .operator{ top:65px; right:330px;} +.add-form .personInCharge{ top:155px; right:330px;} +.add-form .disinfectIdentification{ top:245px; right:330px;} +.add-form .disinfectProgram{ top:335px; right:330px; } +.add-form .startDate{ top:425px; right:330px;} +.add-form .endDate{ top:515px; right:330px; } +.add-form .position{ top:605px; right:330px; } +.add-form .add{ bottom:4px; right:-161px;} +.add-form .add a{background:url(pic_bg.jpg) no-repeat; width:169px; height:62px; display:block; line-height:200px; overflow:hidden} +.add-form .add a:hover{ background-position:0 -63px;} +.add-form .add2{ bottom:4px; right:-153px;top:6px} +.add-form .add2{background:url(customerIntobasket.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;} +.add-form .add2:hover{background:url(customerIntobaskethovert.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;} + +.data-table{position:absolute; width:1160px; height:500px; bottom:90px; left:1100px;top:900px;} +.data-table .box{ height:435px; overflow-y:scroll; overflow-x:hidden;} +.data-table .box table{ margin:0 auto; width:1083px} +.data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;} +.data-table .input-a-yellow{ background:url(pic_bg.jpg) no-repeat 0 -1030px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;} +.data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;} +.data-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} +.data-table .add:hover{ background-position:-318px -64px} +.data-table .minus{ background:url(pic_bg.jpg) no-repeat -367px 0px; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} +.data-table .minus:hover{ background-position:-367px -64px} + +.data-table .btn-box{ margin-top:6px;} +.data-table .btn-box table{ margin:0 auto} +.data-table .btn-box input{ background:url(btn-box.jpg) no-repeat; border:none; line-height:200px; overflow:hidden; text-indent:-9999px} +.data-table .btn-box .btn-e{ background:url(btn_save.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;} +.data-table .btn-box .btn-b:hover{ background-position:-142px -64px; } +.data-table .btn-box .btn-c{ background:url(btn_confirm.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-c:hover{ background:url(btn_confirm1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-d{ background:url(btn_cancel.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-d:hover{ background:url(btn_cancel1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-f{ background:url(btn_exit.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; } +.data-table .btn-box .btn-f:hover{ background:url(btn_exit1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.data-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; } +.data-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.mbody .btn-h{ margin-left: 790px;margin-top: 420px; background:url(allIntoBasket.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;} +.mbody .btn-h:hover{ margin-left: 790px;margin-top: 420px; background:url(allIntoBaskehovert.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;} + + +.data-table a{line-height:200px; overflow:hidden; display:block} +.data-table .btn-a{background:url(pic_bg.jpg) no-repeat 0px -284px; width:83px; height:63px; } +.data-table .btn-a:hover{ background-position:0 -349px} +.data-table .btn-b{background:url(pic_bg.jpg) no-repeat -89px -284px; width:83px; height:63px; } +.data-table .btn-b:hover{ background-position:-89px -349px} +.data-table .btn-b-edit{background:url(pic_bg_edit.jpg) no-repeat -89px -284px; width:83px; height:63px; } +.data-table .btn-b-edit:hover{ background-position:-89px -349px} +.data-table .btn-d{background:url(pic_bg.jpg) no-repeat -267px -284px; width:83px; height:63px; } +.data-table .btn-d:hover{ background-position:-267px -349px} +.data-table .btn-c{background:url(pic_bg.jpg) no-repeat -178px -284px; width:83px; height:63px; } +.data-table .btn-c:hover{ background-position:-178px -349px} +.data-table .btn-c-edit{background:url(pic_bg_edit.jpg) no-repeat -178px -284px; width:83px; height:63px; } +.data-table .btn-c-edit:hover{ background-position:-178px -349px} +.data-table td{ padding:4px 2px} + +.fenpei-table{ position:absolute;width:629px; height:167px; top:320px; right:113px} +.fenpei-table .box{height:212px; overflow-y:scroll;overflow-x:hidden} +.fenpei-table .box table{ margin:0 auto; width:620px} +.fenpei-table .box .w1{ width:140px;} +.fenpei-table .box .w2{ width:86px;} +.fenpei-table .box .w3{ width:255px;} + +.fenpei-table .btn{ background:url(pic_bg.jpg) no-repeat 0 -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto} +.fenpei-table .btn:hover{ background-position:0 -475px;} +.fenpei-table table,.zhuangzai-table table{ border-right:1px solid #ddd; border-bottom:1px solid #ddd} +.fenpei-table td,.zhuangzai-table table td{ font-size:18px; color:#666;border-top:1px solid #ddd; border-left:1px solid #ddd; text-align:center; padding:3px 0} + +.zhuangzai-table{position:absolute;width:1215px; height:695px; bottom:64px; left:60px;top:245px;} +.zhuangzai-table .box{height:770px; overflow-y:scroll; overflow-x:hidden} +.zhuangzai-table table td{ padding:7px 0} +.zhuangzai-table .name,.zhuangzai-table .num{} +.zhuangzai-table span{ margin-left:10px;font-size:27px} +.zhuangzai-table p{ margin-left:700px;margin-top:-58px;font-size:27px} +.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{ background:url(table2_bg.gif) no-repeat top center; padding:8px 0px 7px 0;font-size:30px; color:#666; line-height:58px; } +.zhuangzai-table .list-item li em{ width:85px; text-align:center;} +.zhuangzai-table .list-item li i{ width:129px; 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:1205px; 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:626px;height:58px;line-height:25px;overflow:hidden;} +.zhuangzai-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;} +.zhuangzai-table .list-item .num{ width:297px;height:58px;line-height:25px;overflow:hidden;} +.zhuangzai-table .list-item .del{ width:271px;} + +.copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;} + +.clds-box{ width:960px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px} +.clds-box .table{ border:1px solid #ddd; padding:1px} +.clds-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;} +.clds-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;} +.clds-box .box{height:500px; overflow-y:scroll; background:#fff; overflow-x:hidden} +.clds-box .box table{ margin:0 auto; width:935px} +.clds-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0} +.clds-box .box .w1{ width:236px;} +.clds-box .box .w2{ width:171px} +.clds-box .box .w3{ width:190px;} +.clds-box .box .w4{ width:143px} +.clds-box .box .w5{ width:475px} +.clds-box .box .w6{ width:171px} + +.clds-box .box .w11{ width:380px;} +.clds-box .box .w22{ width:190px} +.clds-box .box .w33{ width:190px;} +.clds-box .box .w44{ width:190px} +.clds-box .box .w55{ width:475px} +.clds-box .box .w66{ width:171px} + +.clds-box .box .w111{ width:495px;} +.clds-box .box .w222{ width:455px} +.clds-box .box .w333{ width:180px;} +.clds-box .box .w444{ width:180px} +.clds-box .box .w555{ width:180px} +.clds-box .box .w666{ width:180px} +.clds-box .box .w777{ width:180px} + +.clds-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden } +.clds-box .add:hover{ background-position:0 -751px; } +.clds-box .minus{background:url(pic_bg.jpg) no-repeat -72px -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden} +.clds-box .minus:hover{ background-position:-72px -751px; } +.clds-box .send{ margin-top:15px;} +.clds-box .send td{ text-align:center;} +.clds-box .send .submit{ display:block; width:137px; height:63px; background:url(btn_save.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send .submit:hover{ display:block; width:137px; height:63px; background:url(btn_save1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send .cancel{ display:block; width:137px; height:63px; background:url(btn_cancel.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send .cancel:hover{ display:block; width:137px; height:63px; background:url(btn_cancel1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.clds-box .send table{ width:50%; margin:0 auto} + +.image-box{ width:290px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:0px 0px} +.image-box .table{ border:1px solid #ddd; padding:1px} +.image-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:20px;} +.image-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:40px;} +.image-box .box{height:393px; overflow-y:scroll; background:#fff; overflow-x:hidden} +.image-box .box table{ margin:0 auto; width:290px} +.image-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:13px; color:#2e6271; padding:8px 0} +.image-box .box .w7{font-size:18px; width:20px} +.image-box .box .w8{font-size:18px; width:20px} + +.remark-box{ margin:0 auto; font-size:13px; background:#f0f0f0; padding:0px 0px} +.remark-box .table{ border:1px solid #ddd; padding:1px} +.remark-box .box{ overflow-y:scroll; background:#fff; overflow-x:hidden} +.remark-box .box .notice{color:#2e6271;} +.remark-box .box .noticetitle{text-align:center;font-size:15px;color:#2e6271;} + +.afrl-box{ width:1980px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px} +.afrl-box .table{ border:1px solid #ddd; padding:1px} +.afrl-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;} +.afrl-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;} +.afrl-box .box{height:800px; overflow-y:scroll; background:#fff; overflow-x:hidden} +.afrl-box .box table{ margin:0 auto; width:1965px} +.afrl-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0} +.afrl-box .box .v1{ width:388px;} +.afrl-box .box .v2{ width:388px} +.afrl-box .box .v3{ width:388px;} +.afrl-box .box .v4{ width:388px} +.afrl-box .box .v5{ width:388px} +.afrl-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden } +.afrl-box .add:hover{ background-position:0 -751px; } +.afrl-box .minus{background:url(pic_bg.jpg) no-repeat -72px -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden} +.afrl-box .minus:hover{ background-position:-72px -751px; } +.afrl-box .send{ margin-top:15px;} +.afrl-box .send td{ text-align:center;} +.afrl-box .send .submit{ display:block; width:137px; height:63px; background:url(btn_save.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send .submit:hover{ display:block; width:137px; height:63px; background:url(btn_save1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send .cancel{ display:block; width:137px; height:63px; background:url(btn_cancel.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send .cancel:hover{ display:block; width:137px; height:63px; background:url(btn_cancel1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden} +.afrl-box .send table{ width:50%; margin:0 auto} + +.selblog .select_box{width:133px;height:48px; margin:0 auto} +.selblog div.tag_select{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 0;padding:0 10px 0 20px;line-height:45px; text-align:left;} +.selblog div.tag_select_hover{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 -49px;padding:0 10px 0 20px;line-height:45px;text-align:left;} +.selblog div.tag_select_open{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 -98px;padding:0 10px 0 20px;line-height:45px;text-align:left;} + +.selblog ul.tag_options{position: absolute;list-style:none;padding:0 0 0px;margin:10;width:85px; background:transparent url(../images/selblog.gif) no-repeat -152px -5px; height:75px;} +.selblog ul.tag_options li{display:block;width:65px;padding:0 10px;height:35px;text-decoration:none;line-height:35px;color:#000;} + +.selblog ul.tag_options li.open_hover{color:#F00} +.selblog ul.tag_options li.open_selected{color:#900} + +.add-bao{ width:915px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:20px 0; margin-top:20px} +.add-bao .num{ width:850px; margin:0 auto} +.add-bao .num li{ float:left; width:94px; margin-bottom:8px;} +.add-bao .num li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif} +.add-bao .num li a:hover{ color:#F00} +.add-bao .search td{ font-size:40px;} +.add-bao .search .input{ background:url(pic_bg.jpg) no-repeat 0 -545px; width:291px; height:62px; line-height:45px; overflow:hidden; padding:0 10px; border:none; font-size:26px;} +.add-bao .search .btn{background:url(pic_bg.jpg) no-repeat -177px -417px; width:143px; height:62px; border:none} +.add-bao .search .btn:hover{ background-position:-177px -480px;} +.add-bao .search table{ margin:0 auto} +.add-bao .title{ width:890px; margin:15px auto} +.add-bao .list-item{ width:890px; margin-left: 50px} +.add-bao .list-item li{ float:left; width:400px; padding-right:10px; margin-bottom:8px;} +.add-bao .list-item li a{ background:url(pic_li.jpg) no-repeat 0 0; width:395px; height:54px; line-height:62px; overflow:hidden; padding:0 10px;font-size:22px; display:block} + +.num-ten{ width:575px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:30px 0; margin-top:20px} +.num-ten .num{ width:520px; margin:0 auto} +.num-ten .num li{ float:left; width:100px; margin-bottom:8px;} +.num-ten .num li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px; width:52px; height:62px; font-size:40px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif} +.num-ten .num li a:hover{ color:#F00} +.num-ten .search td{ font-size:26px; } +.num-ten .search .input{ background:url(pic_bg.jpg) no-repeat -288px -822px; width:148px; height:62px; line-height:45px; overflow:hidden; padding:0 3px; border:none; font-size:26px;} +.num-ten .search .btn-a{background:url(pic_bg.jpg) no-repeat -140px -691px; width:103px; height:62px; border:none; margin-right:5px} +.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} + + +.selectDate-table{width:1080px; height:250px;} +.selectDate-table .box{ height:250px; overflow-y:hidden; overflow-x:hidden;} +.selectDate-table .box table{ margin:0 auto; width:933px} +.selectDate-table input{text-align:center;} +.selectDate-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:396px; height:62px; font-size:26px; padding:0 10px; line-height:40px;} +.selectDate-table .input-a-yellow{ background:url(pic_bg.jpg) no-repeat 0 -1030px; border:none; width:396px; height:62px; font-size:26px; padding:0 10px; line-height:40px;} +.selectDate-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:62px; height:62px; font-size:26px; padding:0 0px; line-height:40px;} +.selectDate-table .input-title{ border:none; width:105px; height:62px; font-size:26px; padding:0 5px; line-height:40px;} +.selectDate-table .input-head{ border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;} +.selectDate-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} +.selectDate-table .add:hover{ background-position:-318px -64px} +.selectDate-table .minus{ background:url(pic_bg.jpg) no-repeat -367px 0px; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} +.selectDate-table .minus:hover{ background-position:-367px -64px} + +.selectDate-table .btn-box{ margin-top:6px;} +.selectDate-table .btn-box table{ margin:0 auto} +.selectDate-table .btn-box input{ background:url(btn-box.jpg) no-repeat; border:none; line-height:200px; overflow:hidden; text-indent:-9999px} +.selectDate-table .btn-box .btn-e{ background:url(btn_save.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;} +.selectDate-table .btn-box .btn-b:hover{ background-position:-142px -64px; } +.selectDate-table .btn-box .btn-c{ background:url(btn_confirm.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-c:hover{ background:url(btn_confirm1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-d{ background:url(btn_cancel.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-d:hover{ background:url(btn_cancel1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-f{ background:url(btn_exit.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; } +.selectDate-table .btn-box .btn-f:hover{ background:url(btn_exit1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} +.selectDate-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; } +.selectDate-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} + + +.selectDate-table a{line-height:200px; overflow:hidden; display:block} +.selectDate-table .btn-a{background:url(pic_bg.jpg) no-repeat 0px -284px; width:83px; height:63px; } +.selectDate-table .btn-a:hover{ background-position:0 -349px} +.selectDate-table .btn-b{background:url(pic_bg.jpg) no-repeat -89px -284px; width:83px; height:63px; } +.selectDate-table .btn-b:hover{ background-position:-89px -349px} +.selectDate-table .btn-d{background:url(pic_bg.jpg) no-repeat -267px -284px; width:83px; height:63px; } +.selectDate-table .btn-d:hover{ background-position:-267px -349px} +.selectDate-table .btn-c{background:url(pic_bg.jpg) no-repeat -178px -284px; width:83px; height:63px; } +.selectDate-table .btn-c:hover{ background-position:-178px -349px} +.selectDate-table td{ padding:4px 4px} \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r15377 -r15432 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15377) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15432) @@ -217,6 +217,19 @@ } return null; } + /** + * 根据key获取config.js的配置 + * @param key + * @return 布尔变量 + */ + public static Boolean getSystemSetConfigByNameBool(String key){ + Boolean ret = false; // 默认返回false + String value = getSystemSetConfigByName(key); + if(StringUtils.isNotBlank(value)){ + ret = Boolean.valueOf(value); + } + return ret; + } // 判断用户名是否为条形码编码 public static boolean usernameIsBarcode(String username) { return username.matches("^[0-9]{9}$");