Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r27460 -r27478 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27460) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27478) @@ -977,11 +977,11 @@ ''+ ''+ depart + '' + - ''+ - ''+ + ''+ + ''+ addButton+ ''+ - ''+ + ''+ reduceButton+ '入筐'+ ''); @@ -1244,22 +1244,26 @@ timeout : 300000, data : {params:"" + JSON.stringify(array[i]) + ""}, success : function(msg) { - var json = JSON.parse(msg); - if(json.versionNotMatch){ - closeDiv(); - layer.open({ - type: 1, - content: '' + json.message + '', //这里content是一个普通的String - btn: ['关闭','关闭并刷新'], - area: ['600px', '400px'], - btnAlign: 'c', - btn2:function(){ - refresh(); - } - }); - }else{ - updateProgressBar((i+1)); - } + var json = JSON.parse(msg); + if(json.success){ + if(json.versionNotMatch){ + closeDiv(); + layer.open({ + type: 1, + content: '' + json.message + '', //这里content是一个普通的String + btn: ['关闭','关闭并刷新'], + area: ['600px', '400px'], + btnAlign: 'c', + btn2:function(){ + refresh(); + } + }); + }else{ + updateProgressBar((i+1)); + } + }else { + alertDiv(json.msg); + } }, error: function(x, t, m) { if(t == "timeout") {