Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp =================================================================== diff -u -r26707 -r27023 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp (.../disinfectionTousseItems.jsp) (revision 26707) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp (.../disinfectionTousseItems.jsp) (revision 27023) @@ -70,15 +70,17 @@ materialItem.count = $('#count'+i).text(); materialItems.push(materialItem); }); - closeLayer();// 自动化测试无法定位到alert窗口,因此移动closeLayer()方法到前面执行 - if(window.parent){ - var falg= window.parent.createMaterialInfo(materialItems,row); - if(falg){ - alert('修改成功。'); - }else{ - alert('修改失败。'); - } - } + closeLayer();// 自动化测试无法定位到alert窗口,因此移动closeLayer()方法到前面执行 + if(window.parent){ + var falg= window.parent.createMaterialInfo(materialItems,row); + if(falg){ + parent.window.newAlert('修改成功。'); + + }else{ + parent.window.newAlert('修改失败。'); + } + } + } function loadMaterialNotice(materialDefinitionId){ $.ajax({ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r26788 -r27023 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 26788) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27023) @@ -107,6 +107,12 @@ .zhuangzai-table .list-item .totalnum{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;} .add-form .departmentSender{top: -97px;left: -114px;font-size: 23px;color: #3B5B67;} .departmentSender{display: none;} + +.autoCloseText,.autoCloseBtn{margin:0px;padding:0px;} +.autoCloseAlert{border: 1px solid #dcdcdc;background:#eeeeee;padding: 12px 10px; width:300px;position:absolute;z-index:222220000;top:8px;margin-left: -150px;left:50%;border-radius:5px;display: none;} +.autoCloseTitle{font-size:18px;font-weight: bold;font-family: "微软雅黑";margin-bottom:0;} +.autoCloseText{color:red;font-size:22px;margin-left: 29px;} +.autoCloseBtn{font-size:14px;color:#b5a614;display: block;cursor: pointer;} @@ -212,7 +218,22 @@ openInputRemark(); }); }); - +var newTimer = null; +function newAlert(msg){ + $("#autoCloseAlert").show(); + $(".autoCloseText").text(msg); + if(newTimer != null){ + clearTimeout(newTimer); + newTimer = null; + } + newTimer = setInterval(function(){ + $("#autoCloseAlert").hide(); + $(".autoCloseText").text(""); + },5000); +} +function newAlertClose(){ + $("#autoCloseAlert").hide(); +} var PACKAGE_TYPE_INSIDE = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>'; var PACKAGE_TYPE_DISINFECTION = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>'; var ENABLE_SPEECH_RECOGNITION = ${ENABLE_SPEECH_RECOGNITION}; @@ -262,6 +283,11 @@ } +
提示
+ + 关闭 +