From 4ce7ebef05447f67ae1095dba1de7a9e883d8af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Tue, 9 Apr 2019 09:30:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=B9=B6=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E6=8C=89=E9=92=AE=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/static/global/scripts/common.js | 68 +++++++++++-------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index cbf14de7a..6149e49d7 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -438,43 +438,48 @@ $(function(){ 'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词 maxCount:4, onAddTag:function(tag,size){ - var reg = new RegExp(/\t|\r|\n/); + var reg = new RegExp(/\t|\r|\n/); if (tag.match(reg)) { $(this).parent(".col-md-6").next("div").html(""); }else{ $(this).parent(".col-md-6").next("div").html(""); } //var keywordValue = ""; - var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; - /*$("span[class='tag']").each(function(){ - keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); - }); - $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ - exprTypeChecked(objNamePrefix,size,options); - - var tagObj = $(this); - for(var key in protectionData){ - if(tagObj.hasClass(key)){ - protectedListWarn(tagObj,key); - } - } - }, - onRemoveTag:function(tag,size){ - $(this).parent(".col-md-6").next("div").html(""); - //var keywordValue = ""; - var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; - /*$("span[class='tag']").each(function(){ + var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; + /*$("span[class='tag']").each(function(){ keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); }); $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ - exprTypeChecked(objNamePrefix,size,options); + exprTypeChecked(objNamePrefix,size,options); + + if(size == 1){ + var tagObj = $(this); + for(var key in protectionData){ + if(tagObj.hasClass(key)){ + protectedListWarn(tagObj,key); + } + } + } + + }, + onRemoveTag:function(tag,size){ + $(this).parent(".col-md-6").next("div").html(""); + //var keywordValue = ""; + var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; + /*$("span[class='tag']").each(function(){ + keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); + }); + $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ + exprTypeChecked(objNamePrefix,size,options); - var tagObj = $(this); - for(var key in protectionData){ - if(tagObj.hasClass(key)){ - protectedListWarn(tagObj,key); - } - } + if(size == 1){ + var tagObj = $(this); + for(var key in protectionData){ + if(tagObj.hasClass(key)){ + protectedListWarn(tagObj,key); + } + } + } } }); $(".tagsinput").popover({ @@ -587,6 +592,15 @@ $(function(){ window.history.back(); return false; }); + $("#cancel").on("click",function(){ + window.history.back(); + return false; + }); + $("button[id='audit']").on("click",function(){ + $("input[name='isValid']").val(1); + $("input[name='isAudit']").val(1); + }); + //去掉首尾空格 $("input,textarea").on("blur",function(){ if($(this).attr("type")!="file"){ From 3be1c1a625ea302c6f8fbfdaa5d82c543e96a66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Tue, 9 Apr 2019 15:29:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=97=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E3=80=90?= =?UTF-8?q?=E6=AD=A4=E4=BF=AE=E6=94=B9=E4=BF=AE=E5=A4=8D=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E9=80=9A=E8=BF=87insert=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=95=88?= =?UTF-8?q?=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=B0=86=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=AE=9E=E4=BD=93=E7=9A=84=E7=8A=B6=E6=80=81=E5=8F=88?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E6=97=A0=E6=95=88=E7=9A=84BUG=E3=80=91?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9daily=E5=92=8Cweekly=E7=9A=84?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=99=A8=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BB=BB=E5=8A=A1=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E8=BF=87=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=BB=8E=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=91=A8=E6=9C=9F=E5=BC=80=E5=A7=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleUpdateInterceptor.java | 5 ++- .../java/com/nis/quartz/ScheduleCfgJob.java | 42 ++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java index f38ed2839..23e628ecd 100644 --- a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java +++ b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java @@ -161,10 +161,11 @@ public class ScheduleUpdateInterceptor extends BaseInterceptor{ //整理需要 insert 的 schedule_cfg 的数据 List scheduleList = Lists.newArrayList(); for(BaseCfg baseCfg : cfgList) { - baseCfg.setIsValid(0);//设置默认值 - baseCfg.setIsAudit(0);//设置默认值 ScheduleCfg scList = copyScheduleCfgFromBaseCfg(baseCfg, tableName); if(scList!=null){ + //TODO 定时任务设置默认为isValid=0 isAudit=0，需要考虑允许用户新增isValid=1 isAudit=1的配置下发 + scList.setIsValid(0);//设置默认值 + scList.setIsAudit(0);//设置默认值 scheduleList.add(scList); } } diff --git a/src/main/java/com/nis/quartz/ScheduleCfgJob.java b/src/main/java/com/nis/quartz/ScheduleCfgJob.java index 24daaacd0..bcd20547c 100644 --- a/src/main/java/com/nis/quartz/ScheduleCfgJob.java +++ b/src/main/java/com/nis/quartz/ScheduleCfgJob.java @@ -315,6 +315,34 @@ public class ScheduleCfgJob implements Job { Date invalidTime = DateBuilder.todayAt(invalidList.get(0), invalidList.get(1), invalidList.get(2)); CalendarIntervalScheduleBuilder intervalBuilder = null; if("EVERYDAY".equalsIgnoreCase(dayOrWeek)) { + //开始时间+2分钟 + Calendar validStartCal=Calendar.getInstance(); + validStartCal.setTime(validStartTime); + validStartCal.add(Calendar.MINUTE, 2); + long validStartTimes=validStartCal.getTime().getTime(); + //结束时间+2分钟 + Calendar invalidCal=Calendar.getInstance(); + invalidCal.setTime(invalidTime); + invalidCal.add(Calendar.MINUTE, 2); + long invalidTimes=validStartCal.getTime().getTime(); + long currentTimes=new Date().getTime(); + //开始时间设置为今天已过时，则将开始时间加上周期 + if((currentTimes-validStartTimes) > 0) { + Calendar validStartCalNew=Calendar.getInstance(); + validStartCalNew.setTime(validStartTime); + validStartCalNew.add(Calendar.DAY_OF_MONTH, interval); + validStartTime=validStartCalNew.getTime(); + } + + //结束时间设置为今天已过时，则将开始时间加上周期 + if((currentTimes-invalidTimes) > 0) { + Calendar invalidCalNew=Calendar.getInstance(); + invalidCalNew.setTime(invalidTime); + invalidCalNew.add(Calendar.DAY_OF_MONTH, interval); + invalidTime=invalidCalNew.getTime(); + } + + intervalBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule().withIntervalInDays(interval); //valid JobDataMap dataMap = new JobDataMap(); @@ -329,6 +357,7 @@ public class ScheduleCfgJob implements Job { .startAt(validStartTime) .build(); triList.add(validTri); + //invalid dataMap = new JobDataMap(); dataMap.put("isValid", false); @@ -478,14 +507,25 @@ public class ScheduleCfgJob implements Job { /** - * 查找最近的 星期几 ，包括今天 + * 查找最近的 星期几 ，包括今天(如果今天的时间点已过，从明天开始算) * @param date * @param w 周一开始 1 -7 * @return */ public static Date closestAfterWeek(Date date,int w) { + //设置calC为开始时间+2分钟，判断calC时间是否已过，如果小于当前时间则直接从明天开始算 + Calendar calC = Calendar.getInstance(); + calC.setTime(date); + calC.add(Calendar.MINUTE, 2); + long currentDate=new Date().getTime();//当前时间 + long weekStartDate=calC.getTime().getTime();//周任务开始时间+2分钟 + Calendar cal = Calendar.getInstance(); cal.setTime(date); + //如果开始时间已过期，则从明天开始算 + if((currentDate-weekStartDate) > 0) { + cal.add(Calendar.DAY_OF_MONTH, 1); + } int i = cal.get(Calendar.DAY_OF_WEEK);//周日开始 1-7 i = (i==1)? 7: i-1;//转换为 周一到 周日 1-7 cal.add(Calendar.DAY_OF_MONTH, (i>w)?(7-(i-w)) : (w-i)); From add20445adfd4c8e538380eddd66a6e4f275d8f0 Mon Sep 17 00:00:00 2001 From: leijun Date: Tue, 9 Apr 2019 15:31:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=89=80=E6=9C=89SubscribeID=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=9D=87=E6=94=AF=E6=8C=81SubscribeID=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E4=B8=8B=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp | 11 ++++++----- .../webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 12 +++++++----- .../WEB-INF/views/cfg/fileTransfer/ftpForm.jsp | 8 ++++---- .../WEB-INF/views/cfg/fileTransfer/p2pForm.jsp | 12 ++++++------ src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp | 12 ++++++------ .../views/cfg/proxy/control/httpRedirectForm.jsp | 2 +- .../webapp/WEB-INF/views/cfg/website/dnsForm.jsp | 12 ++++++------ .../webapp/WEB-INF/views/cfg/website/httpForm.jsp | 6 +++--- .../webapp/WEB-INF/views/cfg/website/sslForm.jsp | 10 +++++----- 9 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 0c105a652..0fccd3226 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -42,7 +42,7 @@ submitHandler : function(form) { var flag = true; //存在隐藏的subscribeId，不算进域配置 - if($(".boxSolid[class~='subscribeId']").length>0){ + /* if($(".boxSolid[class~='subscribeId']").length>0){ if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){ if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); @@ -57,10 +57,11 @@ } //代表所有业务都隐藏了，提示必须增加一种业务数据 }else{ - if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ - top.$.jBox.tip("", ""); - return; - } + + } */ + if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ + top.$.jBox.tip("", ""); + return; } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index e835c98ce..1eced3ceb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -42,7 +42,7 @@ submitHandler : function(form) { var flag = true; //存在隐藏的subscribeId，不算进域配置 - if($(".boxSolid[class~='subscribeId']").length>0){ + /* if($(".boxSolid[class~='subscribeId']").length>0){ if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){ if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); @@ -57,10 +57,12 @@ } //代表所有业务都隐藏了，提示必须增加一种业务数据 }else{ - if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ - top.$.jBox.tip("", ""); - return; - } + + } */ + + if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ + top.$.jBox.tip("", ""); + return; } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index 08ec2ebd3..3e570b8d6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -51,7 +51,7 @@ submitHandler : function(form) { var flag = true; - var subscribeId=0; + /* var subscribeId=0; //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; @@ -59,12 +59,12 @@ var boxSolidLenth=$(".boxSolid").length; if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; - } + } */ //代表所有业务都隐藏了，提示必须增加一种业务数据 - if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){ + if(boxSolidLenth == ($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); return; - } + } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index 755380351..304d25084 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -28,20 +28,20 @@ submitHandler : function(form) { var flag = true; - var subscribeId=0; + /* var subscribeId=0; //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; - } + } */ var boxSolidLenth=$(".boxSolid").length; - if($(".boxSolid").hasClass("subscribeId")){ + /* if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; - } + } */ //代表所有业务都隐藏了，提示必须增加一种业务数据 - if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){ + if(boxSolidLenth == ($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); return; - } + } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index 96ac2ac6f..b5b714f36 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -53,20 +53,20 @@ submitHandler : function(form) { var flag = true; - var subscribeId=0; + /* var subscribeId=0; //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; - } + } */ var boxSolidLenth=$(".boxSolid").length; - if($(".boxSolid").hasClass("subscribeId")){ + /* if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; - } + } */ //代表所有业务都隐藏了，提示必须增加一种业务数据 - if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ + if(boxSolidLenth ==($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); return; - } + } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp index c247aa4ca..491fae579 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp @@ -321,7 +321,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 6442a254e..d1ca04334 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -32,20 +32,20 @@ submitHandler : function(form) { var flag = true; - var subscribeId=0; + /* var subscribeId=0; //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; - } + } */ var boxSolidLenth=$(".boxSolid").length; - if($(".boxSolid").hasClass("subscribeId")){ + /* if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; - } + } */ //代表所有业务都隐藏了，提示必须增加一种业务数据 - if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ + if(boxSolidLenth ==($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); return; - } + } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 930e0e323..6e9119f0b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -78,12 +78,12 @@ return; } } - if(!$(".httpResCfg").hasClass("hidden")){ + if(!$(".httpResCfg").hasClass("hidden")){ if($(".httpResCfg").find(".boxSolid").length==$(".httpResCfg").find(".boxSolid.hidden").length){ top.$.jBox.tip("", ""); return; } - } + } //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); @@ -397,7 +397,7 @@ -
+

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 49dfa7105..6b004692c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -34,19 +34,19 @@ submitHandler : function(form) { //loading('onloading...'); var flag = true; - var subscribeId=0; + /* var subscribeId=0; //console.log("boxSolid:"+$(".boxSolid.hidden").length); //console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId")); //存在隐藏的subscribeId，不算进域配置 if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; - } + } */ var boxSolidLenth=$(".boxSolid").length; - if($(".boxSolid").hasClass("subscribeId")){ + /* if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; - } + } */ //代表所有业务都隐藏了，提示必须增加一种业务数据 - if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ + if(boxSolidLenth ==($(".boxSolid.hidden").length)){ top.$.jBox.tip("", ""); return; } From 9f97dc22027e701a6e764f5e4fe0351796438e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Tue, 9 Apr 2019 15:45:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89cancel=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=A4=8D=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/static/global/scripts/common.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 6149e49d7..423ef31e4 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -588,10 +588,6 @@ $(function(){ $(this).val(ns); });*/ $("input[name*='userRegion'][type='text']").addClass("invisibleChar"); - $("#cancel").on("click",function(){ - window.history.back(); - return false; - }); $("#cancel").on("click",function(){ window.history.back(); return false;