Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js =================================================================== diff -u -r24045 -r24049 --- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js (.../scheduleDefinitionHistory.js) (revision 24045) +++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js (.../scheduleDefinitionHistory.js) (revision 24049) @@ -6,7 +6,6 @@ var t = $("#handoverTable") .bootstrapTable( { -// url : encodeURI(WWWROOT + '/disinfectSystem/baseData/handoverAction!getAllHandover.do?time='+new Date()), data:data, method : 'get', dataType : "json", @@ -24,7 +23,7 @@ responseHandler : "", //分页栏 pageSize : 15,// 如果设置了分页,页面数据条数 - pageList : [ 10, 15, 20 ], // 如果设置了分页,设置可供选择的页面数据条数。设置为All则显示所有记录。 + pageList : [ 10, 20,30 ], // 如果设置了分页,设置可供选择的页面数据条数。设置为All则显示所有记录。 paginationPreText: "上一页", paginationNextText: "下一页", paginationFirstText: "首页", @@ -114,8 +113,6 @@ async:false, success:function(msg){ scheduleDefinitions=msg.data.data; - },error:function(){ - alert("error"); } }); return scheduleDefinitions; Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformationView.jsp =================================================================== diff -u -r24045 -r24049 --- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformationView.jsp (.../scheduleInformationView.jsp) (revision 24045) +++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformationView.jsp (.../scheduleInformationView.jsp) (revision 24049) @@ -59,7 +59,7 @@
-
+
  • Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js =================================================================== diff -u -r24045 -r24049 --- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js (.../scheduleDefinition.js) (revision 24045) +++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js (.../scheduleDefinition.js) (revision 24049) @@ -51,6 +51,7 @@ verification=false; } + var isSuccess=true; if(verification){ $.ajax({ url:WWWROOT + '/disinfectSystem/scheduleDefinition/saveOrUpdateScheduleDefinition.mhtml?time='+new Date(), @@ -61,19 +62,23 @@ traditional: true,//这里设置为true dataType:'json', success:function(msg){ - console.log(msg); + if(msg.code==500){ + alert(msg.msg); + isSuccess=false; + } } }); - - $('#myModal').modal('hide'); - //清空表单数据 - $('#select_department').val(""); - $('#startWorkTime_input').val(""); - $('#offWorkTime_input').val(""); - $('#remarks').val(""); - $('#name').val(""); - //重新加载页面, - loadTable(); + if(isSuccess){ + $('#myModal').modal('hide'); + //清空表单数据 + $('#select_department').val(""); + $('#startWorkTime_input').val(""); + $('#offWorkTime_input').val(""); + $('#remarks').val(""); + $('#name').val(""); + //重新加载页面, + loadTable(); + } } }); //【弹窗--提交表单】--end @@ -251,7 +256,7 @@ success:function(msg){ scheduleDefinitions=msg.data.data; },error:function(){ - alert("error"); + alert("访问出错"); } }); return scheduleDefinitions; @@ -284,7 +289,7 @@ responseHandler : "", //分页栏 pageSize : 15,// 如果设置了分页,页面数据条数 - pageList : [ 10, 15, 20 ], // 如果设置了分页,设置可供选择的页面数据条数。设置为All则显示所有记录。 + pageList : [ 10,20,30], // 如果设置了分页,设置可供选择的页面数据条数。设置为All则显示所有记录。 paginationPreText: "上一页", paginationNextText: "下一页", paginationFirstText: "首页", Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js =================================================================== diff -u -r24043 -r24049 --- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js (.../scheduleInformation.js) (revision 24043) +++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js (.../scheduleInformation.js) (revision 24049) @@ -201,7 +201,7 @@ } },error:function(){ - alert("error"); + alert("提交访问出错!"); } }); if(isSuccess){ @@ -271,7 +271,7 @@ success:function(msg){ scheduleDefinitions=msg.data.data; },error:function(){ - alert("error"); + alert("访问出错!"); } }); return scheduleDefinitions; @@ -289,7 +289,7 @@ success:function(msg){ scheduleInformations=msg.data; },error:function(){ - alert("error"); + alert("访问出错"); } }); return scheduleInformations; @@ -327,7 +327,7 @@ success:function(msg){ console.log(msg); },error:function(){ - alert("error"); + alert("访问出错"); } }); } @@ -344,7 +344,7 @@ success:function(msg){ console.log(msg); },error:function(){ - alert("error"); + alert("访问出错"); } }); } @@ -360,7 +360,7 @@ success:function(msg){ users=msg.data; },error:function(){ - alert("error"); + alert("访问出错"); } }); return users;