Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r23239 -r23244 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 23239) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 23244) @@ -203,14 +203,12 @@
+
-
- -
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r23239 -r23244 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23239) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 23244) @@ -91,9 +91,9 @@ $('#idBoxCenterUserType').hide(); } if(showRefreshButton){ - $('#idBoxCenterRefresh').show(); + $('#idRefreshButton').show(); }else{ - $('#idBoxCenterRefresh').hide(); + $('#idRefreshButton').hide(); } ab = new AlertBox("idBox"); ab.onShow = function(){ @@ -2808,7 +2808,7 @@ } }else{ if(result.versionNotMatch){ - alertDiv(result.message,true,false,true); + alertDiv(result.message,false,false,true); }else{ alertDiv(result.message); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r23239 -r23244 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 23239) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 23244) @@ -118,10 +118,8 @@
+
-
- -
@@ -241,12 +239,12 @@ $("#progressbar").hide(); } if(showRefreshButton){ - $('#idBoxCenterRefresh').show(); + $('#idRefreshButton').show(); //显示刷新按钮就不要滚动条了 $("#progressbar").hide(); }else{ //滚动条由上面逻辑去显示或者隐藏 - $('#idBoxCenterRefresh').hide(); + $('#idRefreshButton').hide(); } ab = new AlertBox("idBox"); ab.onShow = function(){ @@ -1103,7 +1101,7 @@ success : function(msg) { var json = JSON.parse(msg); if(json.versionNotMatch){ - alertDiv(json.message,true,true); + alertDiv(json.message,false,true); }else{ updateProgressBar((i+1)); }