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 2f1698ad0..f5cf0f263 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -23,6 +23,23 @@ }); */ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); + + var action=$("input[name='action']:checked").val(); + if(action==16){ + $("#keywords").addClass("hidden"); + }else{ + $("#keywords").removeClass("hidden"); + } + + $(".action").on("change", function() { + var action=$("input[name='action']:checked").val(); + if(action==16){ + $("#keywords").addClass("hidden"); + }else{ + $("#keywords").removeClass("hidden"); + } + }); + $("#cfgFrom").validate( { errorPlacement : function(error, element) { @@ -299,7 +316,7 @@ -

+

-

+

- help + diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 01effc00b..5c0313261 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -80,7 +80,7 @@ $(document).ready(function() { }); $("#myexport").click(); $("caption").remove(); - totaltb(pato,size); + //totaltb(pato,size); }); @@ -253,10 +253,10 @@ function customColumnClick(){ //合计table中某一段数据 function totaltb(paNo,paSize){ - if(paSize>0){ + /* if(paSize>0){ size=paSize; pato=paNo; - } + } */ $('#total').remove(); var reportBusinessType=$("#reportBusinessType").val() var tableId="tagTable"; @@ -285,10 +285,10 @@ function customColumnClick(){ s=2; } - if(paNo > 1){ + /* if(paNo > 1){ row=(paNo-1)*paSize+1; - } - for (var i = row; i < rows.length; i++) { + } */ + for (var i = 1; i < rows.length; i++) { for (var j = s; j 1){ var trtotal=""; diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js index 3a6a698c0..afe52b090 100644 --- a/src/main/webapp/static/global/scripts/pzLog.js +++ b/src/main/webapp/static/global/scripts/pzLog.js @@ -71,7 +71,8 @@ var GetLogTotal=function(_data){ for(var i=0;i"+data[i].sum+""); + $(this).html(data[i].sum); + $(this).parent("tr").find("td:eq(1)").html(""+data[i].compileId+""); hasLog=true; } }