Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/messages/message_en.properties

src/main/webapp/WEB-INF/include/form/pageGroup.jsp

@@ -0,0 +1,146 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<script>
+function pagination() {
+
+	pageNo = 1;
+	count = $('tbody').children().size();// 总记录数
+	//处理ajax时jquery选择器缓存的问题
+/* 	dataLength = "${fn:length(datas)}";
+	preCount = 0;
+	if (dataLength < count) {
+		preCount = count - dataLength;
+		count = count - preCount;
+		alert(count)
+		//$('tbody').children().slice(0, preCount).remove();
+	} */
+	
+	
+	pageSize = 30; // 页面大小
+	first = 1;// 首页索引
+	last = Math.ceil(count/pageSize);// 尾页索引
+	length = 8;// 显示页面长度
+	slider = 1;// 前后显示页面长度
+	funcParam = "";
+	if (last == 0) {
+		last++;
+	}
+	if (last < first) {
+		last = first;
+	}
+	if (pageNo <= 1) {
+		pageNo = first;
+		firstPage = true;
+	}
+	if (pageNo >= last) {
+		pageNo = last;
+		lastPage = true;
+	}
+	if (pageNo < last - 1) {
+		next = pageNo + 1;
+	} else {
+		next = last;
+	}
+	if (pageNo > 1) {
+		prev = pageNo - 1;
+	} else {
+		prev = first;
+	}
+	if (pageNo < first) {
+		pageNo = first;
+	}
+
+	if (pageNo > last) {
+		pageNo = last;
+	}
+	toPage(1, pageSize, '');
+}
+
+//跳页
+function toPage(pageNo, pageSize, funcParam) {
+	prev = pageNo - 1;
+	next = pageNo + 1;
+	
+	var inhtml = getFootHtml(pageNo);
+
+	$(".page").html(inhtml);
+
+	//隐藏该对象下面的所有子元素
+	$('tbody').children().css('display', 'none');
+	//显示元素
+	$('tbody').children().slice((pageNo-1)*pageSize, pageNo*pageSize).css('display', '');
+}
+
+//底部跳页按钮
+function getFootHtml(pageNo) {
+	var htm = "";
+	if (count == 0) {
+		htm = "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;" + "<spring:message code="noneData"/>" + "</div>";
+		return htm;
+	}
+	htm = "<ul>";
+	if (pageNo == first) {
+		htm += "<li class=\"disabled\"><a href=\"javascript:\">&#171; " + "<spring:message code="previousPage"/>" + "</a></li>";
+	} else {
+		htm += "<li><a href=\"javascript:\" onclick=\"toPage(" + prev + "," + pageSize + ",'" + funcParam + "');\">&#171; " + "<spring:message code="previousPage"/>" + "</a></li>";
+	}
+	
+	var begin = pageNo - (length / 2);
+
+	if (begin < first) {
+		begin = first;
+	}
+
+	var end = begin + length - 1;
+
+	if (end >= last) {
+		end = last;
+		begin = end - length + 1;
+		if (begin < first) {
+			begin = first;
+		}
+	}
+
+	if (begin > first) {
+		var i = 0;
+		for (i = first; i < first + slider && i < begin; i++) {
+			htm += "<li tmp=\"" + i + "\"><a href=\"javascript:\" onclick=\"toPage(" + i + "," + pageSize + ",'" + funcParam + "');\">" +  (i + 1 - first) + "</a></li>";
+		}
+		if (i < begin) {
+			htm += "<li class=\"disabled\"><a href=\"javascript:\">...</a></li>";
+		}
+	}
+
+	for (var i = begin; i <= end; i++) {
+		if (i == pageNo) {
+			htm += "<li class=\"active\"><a href=\"javascript:\">" + (i + 1 - first) + "</a></li>";
+		} else {
+			htm += "<li><a href=\"javascript:\" onclick=\"toPage(" + i + "," + pageSize + ",'" + funcParam + "');\">" + (i + 1 - first) + "</a></li>";
+		}
+	}
+
+	if (last - end > slider) {
+		htm += "<li class=\"disabled\"><a href=\"javascript:\">...</a></li>";
+		end = last - slider;
+	}
+
+	for (var i = end + 1; i <= last; i++) {
+		htm += "<li><a href=\"javascript:\" onclick=\"toPage(" + i + "," + pageSize + ",'" + funcParam + "');\">" + (i + 1 - first) + "</a></li>";
+	}
+	
+	if (pageNo == last) {
+		htm += "<li class=\"disabled\"><a href=\"javascript:\">" + "<spring:message code="nextPage"/>" + " &#187;</a></li>";
+	} else {
+		htm += "<li><a href=\"javascript:\" onclick=\"toPage(" + next + "," + pageSize + ",'" + funcParam + "');\">" + "" + "<spring:message code="nextPage"/>" + " &#187;</a></li>";
+	}
+
+	htm += "<li class=\"disabled controls\"><a href=\"javascript:\">" + "<spring:message code="current"/>" + " ";
+	htm += "<input type=\"text\" value=\"" + pageNo + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
+	htm += "toPage(this.value," + pageSize + ",'" + funcParam + "');\" onclick=\"this.select();\"/> / ";
+	htm += "<input type=\"text\" value=\"" + last + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
+	htm += "(toPage" + pageNo + ",this.value,'" + funcParam + "');\" onclick=\"this.select();\"/> " + "<spring:message code="page"/>" + "，";
+	htm += "" + "<spring:message code="total"/>" + " <span id='showTotalCount'>" + count + "</span> " + "<spring:message code="count"/>" + "</a></li>";
+	htm += "</ul>";
+	return htm;
+}
+</script>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp

@@ -31,12 +31,12 @@ $(function(){
 	$("#srcFile").on('change',function(){
 		$("#srcFileInfo").val($("#srcFile").val());
 	});
-	$("#uploadSample,#sampleFileInfo").on('click',function(){
+	/* $("#uploadSample,#sampleFileInfo").on('click',function(){
 		$("#sampleFile").trigger("click");
 	});
 	$("#sampleFile").on('change',function(){
 		$("#sampleFileInfo").val($("#sampleFile").val());
-	});
+	}); */
 	$("input[name='areaType']").on('change',function(){
 		var val=$(this).val();
 		if($(this).is(":visible")){
@@ -62,16 +62,16 @@ $(function(){
 	$("#cfgFrom").validate({		
 		submitHandler: function(form){
 			var srcFile = $("#srcFile").val();
-			var sampleFile = $("#sampleFile").val();
+			//var sampleFile = $("#sampleFile").val();
 			var srcUrl = $("#srcUrl").val();
-			var sampleUrl = $("#sampleUrl").val();
+			//var sampleUrl = $("#sampleUrl").val();
 			if((srcUrl==null||srcUrl=="") && (srcFile==null || srcFile=="")){
 				$("div[for='srcFile']").append("<label id='level-error' class='error' for='srcFile'><spring:message code='required'></spring:message></label>");
 				return false;
-			}else if((sampleUrl==null || sampleUrl=="") && (sampleFile==null || sampleFile=="")){
+			}/* else if((sampleUrl==null || sampleUrl=="") && (sampleFile==null || sampleFile=="")){
 				$("div[for='sampleFile']").append("<label id='level-error' class='error' for='sampleFile'><spring:message code='required'></spring:message></label>");
 				return false;
-			}else{
+			} */else{
 				loading('onloading...');
 				form.submit();
 			}
@@ -164,11 +164,11 @@ $(function(){
 							            <div for="srcFileInfo"></div>
 							        </div>
 							    </div>
-							    <div class="col-md-6">
+							    <%-- <div class="col-md-6">
 							        <div class="form-group">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="sample_file"/></label>
 							            <div class="col-md-6">
-							                <%-- <input class="form-control required" type="text" name="sampleUrl" value="${_cfg.sampleUrl}"> --%>
+							                <input class="form-control required" type="text" name="sampleUrl" value="${_cfg.sampleUrl}">
 							                <input id="sampleFile" name="sampleFile" type="file"style="width: 330px;display:none"  />
 							                <div class="input-group">
 								            	 <input id="sampleFileInfo" name="sampleFileInfo" readonly="readonly" data-msg-required="" 
@@ -178,18 +178,15 @@ $(function(){
 								            	 <div class="input-group-btn">
 										             <a id="uploadSample" class="btn btn-default btn-search" href="javascript:" style=""><i class="fa fa-search"></i></a>
 										        </div>
-										        <%-- <span id="srcFileInfo" style="margin-top:20px;margin-left:10px;">${_cfg.srcUrl }</span> --%>
+										        <span id="srcFileInfo" style="margin-top:20px;margin-left:10px;">${_cfg.srcUrl }</span>
 									        </div>
-							                <%-- <button id="uploadSample" type="button" class="btn btn-default btn-search"><spring:message code="select_file"/></button>
-							            	 <span id="sampleFileInfo">${_cfg.sampleUrl }</span> --%>
+							                <button id="uploadSample" type="button" class="btn btn-default btn-search"><spring:message code="select_file"/></button>
+							            	 <span id="sampleFileInfo">${_cfg.sampleUrl }</span>
 							                <input id="sampleUrl" name="sampleUrl" type="hidden" value="${_cfg.sampleUrl }" />
 							            </div>
 							            <div for="sampleFileInfo"></div>
 							        </div>
-							    </div>
-							    
-							</div>
-							<div class="row">
+							    </div> --%>
 							    <div class="col-md-6">
 							        <div class="form-group">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
@@ -212,6 +209,29 @@ $(function(){
 							        </div>
 							    </div>
 							</div>
+							<%-- <div class="row">
+							    <div class="col-md-6">
+							        <div class="form-group">
+							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
+							            <div class="col-md-6">
+							            	<c:forEach items="${serviceList}" var="service">
+							                	<label class="radio-inline">
+							                		<c:if test="${_cfg.functionId eq service.functionId}">
+							                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
+									            			<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+									            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
+							                		</c:if>
+							            		</label>
+							            	</c:forEach>
+							            </div>
+							            <div for="action"></div>
+							        </div>
+							    </div>
+							</div> --%>
                            <%--  <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
                            <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

src/main/webapp/WEB-INF/views/report/label.jsp

@@ -1,9 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<script type="text/javascript">
-$(function(){
-});
-</script>
+<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
 <table id="tagTable" class="table table-striped table-bordered table-condensed text-nowrap">
 <thead>
 	<tr>
@@ -15,18 +12,25 @@ $(function(){
 	</tr>
 </thead>
 <tbody>
-	<c:forEach items="${datas}" var="data">
-	<tr>
-		 <td>
-		 	<c:forEach items="${labels}" var="label">
-			<c:if test="${label.serviceDictId==data.key}">${label.itemValue}</c:if>
+	<script type="text/javascript">
+		var trContent = "";
+		<c:forEach items="${datas}" var="data">
+			trContent += "<tr>";
+			<c:forEach items="${labels}" var="label">
+				<c:if test="${label.serviceDictId==data.key}">
+					trContent += "<td>${label.itemValue}</td>";
+				</c:if>
 			</c:forEach>
-		</td> 
-		<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-			<td>${cloumn}</td>
+			<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+				trContent += "<td>${cloumn}</td>";
+			</c:forEach>
+		 	trContent += "</tr>";
 		</c:forEach>
-	</tr>
-	</c:forEach>
+		$('tbody').remove();
+		$('#tagTable').append("<tbody></tbody>");
+		$('tbody').html(trContent);
+		pagination();
+	</script>
 </tbody>
 </table>
-<div class="page">${page}</div>
+<div class="page"></div>

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -105,11 +105,12 @@
 	}
 	
 var ajaxReport=function(url,target){
-	loading('<spring:message code="onloading"/>');
+	//loading('<spring:message code="onloading"/>');
 	$.ajax({
 		type:'post',
 		async:false,
-		url:'${ctx}'+url,///report/ajaxNtcTagReport
+		cache:false,
+		url:'${ctx}'+url+"?random="+Math.random,///report/ajaxNtcTagReport
 		data:{
 			"action":$('[name="action"]').val(),
 			"reportType":$('[name="reportType"]').val(),
@@ -118,10 +119,10 @@ var ajaxReport=function(url,target){
 		dataType:"html",
 		success:function(data){
 			$(target).html(data);//#label
-			closeTip();
+			//closeTip();
 		}
-	});
-}
+	}); 
+};
 </script>
 </head>
 <body>

src/main/webapp/WEB-INF/views/report/lwhh.jsp

@@ -1,9 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<script type="text/javascript">
-$(function(){
-});
-</script>
+<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
 <table id="lwhhTable" class="table table-striped table-bordered table-condensed text-nowrap">
 <thead>
 	<tr>
@@ -15,18 +12,25 @@ $(function(){
 	</tr>
 </thead>
 <tbody>
-	<c:forEach items="${datas}" var="data">
-	<tr>
-		 <td>
-		 	<c:forEach items="${requestInfos}" var="lwhh">
-			<c:if test="${lwhh.id eq data.key}">${lwhh.requestTitle}</c:if>
+	<script type="text/javascript">
+		var trContent = "";
+		<c:forEach items="${datas}" var="data">
+			trContent += "<tr>";
+			<c:forEach items="${requestInfos}" var="lwhh">
+				<c:if test="${lwhh.id eq data.key}">
+					trContent += "<td>${lwhh.requestTitle}</td>";
+				</c:if>
 			</c:forEach>
-		</td> 
-		<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-			<td>${cloumn}</td>
+			<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+				trContent += "<td>${cloumn}</td>";
+			</c:forEach>
+			trContent += "</tr>";
 		</c:forEach>
-	</tr>
-	</c:forEach>
+		$('tbody').remove();
+		$('#lwhhTable').append("<tbody></tbody>");
+		$('tbody').html(trContent);
+		pagination();
+	</script>
 </tbody>
 </table>
 <div class="page">${page}</div>

src/main/webapp/WEB-INF/views/report/srcIp.jsp

@@ -1,9 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<script type="text/javascript">
-$(function(){
-});
-</script>
+<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%>
 <table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap">
 	<thead>
 		<tr>
@@ -16,16 +13,23 @@ $(function(){
 		</tr>
 	</thead>
 	<tbody>
-		<c:forEach items="${datas}" var="data">
-		<tr>
-		 	<c:forEach items="${fn:split(data.key,splitor)}" var="location">
-			<td>${location}</td>
+		<script type="text/javascript">
+			var trContent = "";
+			<c:forEach items="${datas}" var="data">
+				trContent += "<tr>";
+			 	<c:forEach items="${fn:split(data.key,splitor)}" var="location">
+			 		trContent += "<td>${location}</td>";
+				</c:forEach>
+				<c:forEach items="${data.value}" var="cloumn" varStatus="status">
+					trContent += "<td>${cloumn}</td>";
+				</c:forEach>
+				trContent += "</tr>";
 			</c:forEach>
-			<c:forEach items="${data.value}" var="cloumn" varStatus="status">
-				<td>${cloumn}</td>
-			</c:forEach>
-		</tr>
-	</c:forEach>
+			$('tbody').remove();
+			$('#contentTable1').append("<tbody></tbody>");
+			$('tbody').html(trContent);
+			pagination();
+		</script>
 	</tbody>
 </table>
-<div class="page">${page}</div>
+<div class="page"></div>

src/main/webapp/static/global/scripts/common.js

@@ -767,7 +767,7 @@ var GetLogTotal=function(data){
 	var request=$.ajax({
 		type:'post',
 		timeout:1000,//超时时间设置，查询接口时间过长超时
-		url:pathName+'/logs/ajaxGetLogTotal',
+		url:pathName+'/report/ajaxGetLogTotal',
 		data:{"endTime":timeStamp,"action":data.action,"functionId":data.functionId,"compileId":data.compileId},
 		dataType:'json',
 		async:true,