From d120b76de71cd5697e7ef9dd67d7fa01a5fbfdd2 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Wed, 5 Dec 2018 15:32:50 +0800
Subject: [PATCH] =?UTF-8?q?log=5Ftotal=E9=93=BE=E6=8E=A5=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEID=E4=B8=8A=20=E5=AE=9E=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E5=90=88=E8=AE=A1=E6=89=80=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20mail=E5=92=8Cftp=E9=80=89block=E6=97=B6=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=86=85=E5=AE=B9=E5=B0=81=E5=A0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/fileTransfer/ftpForm.jsp        | 19 ++++++++++++++++++-
 .../WEB-INF/views/cfg/mail/mailForm.jsp       | 15 ++++++++++++++-
 src/main/webapp/WEB-INF/views/home.jsp        |  2 +-
 src/main/webapp/WEB-INF/views/report/list.jsp | 16 ++++++++--------
 .../webapp/static/global/scripts/pzLog.js     |  3 ++-
 5 files changed, 43 insertions(+), 12 deletions(-)

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 @@
 									</c:if>
 									<c:if test="${region.configServiceType eq 'keywords' }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-										<h4 class="form-section">
+										<h4 class="form-section" id="keywords">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
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 6755be4a1..b9dd496ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -17,9 +17,22 @@
 						/* $("#cancel").on("click", function() {
 							window.history.back();
 						});*/
+						
+						var action=$("input[name='action']:checked").val()
+						  if(action==16){
+							  $("#NTC_MAIL_BODY").addClass("hidden");
+						  }else{
+							  $("#NTC_MAIL_BODY").removeClass("hidden");
+						  }
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+						  var action=$("input[name='action']:checked").val()
+						  if(action==16){
+							  $("#NTC_MAIL_BODY").addClass("hidden");
+						  }else{
+							  $("#NTC_MAIL_BODY").removeClass("hidden");
+						  }
 						}); 
 						$("#fileInfo").on('click',function(){
 							$("#file").trigger("click");
@@ -269,7 +282,7 @@
 									</c:if>
 									<c:if test="${region.regionType eq 3 }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-										<h4 class="form-section">
+										<h4 class="form-section"  id="${region.configRegionValue}" >
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index f643efe59..83fe3dfbf 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -340,7 +340,7 @@ background:#3d3d3d;
                          <a href="${ctx}/sys/help" id="helpHref"  target="mainFrame" >
                          	<i class="icon-question  font-sharp"></i>
                          	<span class="username username-hide-on-mobile" id="help">  
-                         		help
+                         		<spring:message code="help" />
                          	</span>
                          </a>
                      </li>
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 <rows[i].cells.length ; j++) {
 			if(list[j]!=null){
 				list[j-s]=parseInt(rows[i].cells[j].innerHTML)+parseInt(list[j-s]);
@@ -296,10 +296,10 @@ function customColumnClick(){
 				list[j-s]=parseInt(rows[i].cells[j].innerHTML);
 		   }
 		}
-		num++;
+	/* 	num++;
 		if(num == paSize){
 			break;
-			}
+			} */
     	 }
  	   if(rows.length  > 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.length;i++){
 						if($(this).attr("compileId")==data[i].compileId){
 							$(this).attr("id",i+"logTotal");
-							$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
+							$(this).html(data[i].sum);
+							$(this).parent("tr").find("td:eq(1)").html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].compileId+"<a>");
 							hasLog=true;
 						}
 					}