From 04db6bcb47060372f6d8ac0ab5c001673d65d5d7 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Mon, 1 Apr 2019 16:32:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=85=AC=E5=85=B1=E7=9A=84Scheduler=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=B9=8B=E5=B7=AE?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E1=E5=88=86=E9=92=9F?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=202.=E5=85=AC=E5=85=B1=E7=9A=84Sche?= =?UTF-8?q?duler=E7=95=8C=E9=9D=A2=E5=8D=95=E6=AC=A1=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8A=A0=E4=B8=8A2=E5=88=86=E9=92=9F?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/include/form/scheduleNew.jsp | 96 +++++++++++++++++-- .../1.11.0/localization/messages_en.js | 3 +- .../1.11.0/localization/messages_ru.js | 3 +- .../1.11.0/localization/messages_zh.js | 3 +- 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp b/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp index fb2909188..42820a24b 100644 --- a/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp +++ b/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp @@ -16,8 +16,36 @@ $(function(){ //获取国际化文件 var title=$.validator.messages.compareDate; + var diff=$.validator.messages.expireTip; + var tip=$.validator.messages.compareTip; var date="2019-03-25 "; - //day 时间验证 + //one 开始时间不能小于当前时间加上2分钟 验证 + jQuery.validator.addMethod("oneStartDate",function(value,element){ + var flagTypeSame=true; + var singleValid = $("#singleValid").val(); + if(singleValid !=null && singleValid !=""){ + var date =new Date(); + var min=date.getMinutes(); + date.setMinutes(min+2); + if(date <= (new Date(singleValid.replace(/-/g,"\/")))){ + flagTypeSame=true; + }else{ + flagTypeSame=false; + } + } + return flagTypeSame; + },tip); + //one 结束时间不能小于开始时间验证 + jQuery.validator.addMethod("oneDate",function(value,element){ + var flagTypeSame=true; + var singleValid = $("#singleValid").val(); + var singleInvalid = $("#singleInvalid").val(); + if(singleValid !=null && singleValid !="" && singleInvalid !=null && singleInvalid !=""){ + flagTypeSame=CompareDate(singleValid,singleInvalid); + } + return flagTypeSame; + },title); + //day 结束时间不能小于开始时间验证 jQuery.validator.addMethod("dayDate",function(value,element){ var flagTypeSame=true; var dayValid = $("#dayValid").val(); @@ -27,7 +55,7 @@ } return flagTypeSame; },title); - //week 时间验证 + //week 结束时间不能小于开始时间验证 jQuery.validator.addMethod("weekDate",function(value,element){ var flagTypeSame=true; var weekValid = $("#weekValid").val(); @@ -37,7 +65,7 @@ } return flagTypeSame; },title); - //month 时间验证 + //month 结束时间不能小于开始时间验证 jQuery.validator.addMethod("monthDate",function(value,element){ var flagTypeSame=true; var monthValid = $("#monthValid").val(); @@ -47,11 +75,61 @@ } return flagTypeSame; },title); - + //一次 验证时间差 + jQuery.validator.addMethod("oneDiffDate",function(value,element){ + var flagTypeSame=true; + var singleValid = $("#singleValid").val(); + var singleInvalid = $("#singleInvalid").val(); + if(singleValid !=null && singleValid !="" && singleInvalid !=null && singleInvalid !=""){ + flagTypeSame=timeToDiffer(singleValid,singleInvalid); + } + return flagTypeSame; + },diff); + //day 验证时间差 + jQuery.validator.addMethod("dayDiffDate",function(value,element){ + var flagTypeSame=true; + var dayValid = $("#dayValid").val(); + var dayInvalid = $("#dayInvalid").val(); + if(dayValid !=null && dayValid !="" && dayInvalid !=null && dayInvalid !=""){ + flagTypeSame=timeToDiffer(date+dayValid,date+dayInvalid); + } + return flagTypeSame; + },diff); + //week 验证时间差 + jQuery.validator.addMethod("weekDiffDate",function(value,element){ + var flagTypeSame=true; + var weekValid = $("#weekValid").val(); + var weekInvalid = $("#weekInvalid").val(); + if(weekValid !=null && weekValid !="" && weekInvalid !=null && weekInvalid !=""){ + flagTypeSame=timeToDiffer(date+weekValid,date+weekInvalid); + } + return flagTypeSame; + },diff); + //month 验证时间差 + jQuery.validator.addMethod("monthDiffDate",function(value,element){ + var flagTypeSame=true; + var monthValid = $("#monthValid").val(); + var monthInvalid = $("#monthInvalid").val(); + if(monthValid !=null && monthValid !="" && monthInvalid !=null && monthInvalid !=""){ + flagTypeSame=timeToDiffer(date+monthValid,date+monthInvalid); + } + return flagTypeSame; + },diff); //比较两个时间的大小 function CompareDate(d1,d2){ return ((new Date(d1.replace(/-/g,"\/"))) <= (new Date(d2.replace(/-/g,"\/")))); } + //计算两个时间的差 是否大于1分钟 + function timeToDiffer(d1,d2){ + var dateBegin = new Date(d1.replace(/-/g,"\/"));//将-转化为/，使用new Date + var dateEnd = new Date(d2.replace(/-/g,"\/")) + var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数 + if(dateDiff<(60*1000)){ + return false; + }else{ + return true; + } + } //day week 切换 function initDayWeek(){ var dayWeekCheck = $("input.dayWeek:checked"); @@ -183,14 +261,14 @@
- +
- +
@@ -216,7 +294,7 @@
- +
@@ -256,7 +334,7 @@
- +
@@ -361,7 +439,7 @@
- +
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index 022af28de..10a80a420 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -91,6 +91,7 @@ info:"Prompt", protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!", log_no_data:"This hour no data", - expireTip:"Start time and end time interval is at least 1 minute" + expireTip:"Start time and end time interval is at least 1 minute", + compareTip:"Start time should not be less than the current time plus 2 minutes." }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index c02c07f4f..84615a9af 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -91,6 +91,7 @@ info:"Инфо", protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!", log_no_data:"Нет данных за этот час", - expireTip:"Start time and end time interval is at least 1 minute" + expireTip:"Start time and end time interval is at least 1 minute", + compareTip:"Start time should not be less than the current time plus 2 minutes." }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index 59c5a67cc..981daba6e 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -91,6 +91,7 @@ info:"提示", protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！", log_no_data:"本小时无数据", - expireTip:"开始时间结束时间间隔至少为1分钟" + expireTip:"开始时间结束时间间隔至少为1分钟", + compareTip:"开始时间不能小于当前时间加上2分钟 " }); }(jQuery));