From ce240eaefcf685a44abe61b42c7127909ffa7274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 17 Dec 2018 15:08:01 +0800
Subject: [PATCH] =?UTF-8?q?iprange=E6=8A=A5=E8=A1=A8=E5=92=8Chttps=20url?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/ipRangeReportList.jsp        | 44 ++++++-------------
 .../WEB-INF/views/report/urlReportList.jsp    | 16 +++----
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
index e63c6135d..2b8242d85 100644
--- a/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
@@ -54,52 +54,34 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					
 						<div class="col-md-12">
-							<div class="pull-left">
-								<div class="input-group">
-									<div class="input-group-btn">
-                                       	<span class="selectpicker form-control" ><spring:message code="area_type"/></span>
-									</div>
-                                </div>
-                            </div>
                             <div class="pull-left">
 								<div class="input-group">
-                                	<div class="input-group-btn">
-										<form:select path="searchCountry" class="selectpicker form-control">
+                                    <div class="input-group-btn">
+                                    	<span class="selectpicker form-control" ><spring:message code="area_type"/></span>
+                                   	</div>
+                                   	<form:select path="searchCountry" class="selectpicker form-control input-medium">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('AREA_TYPE')}" var="areaType" >
 												<form:option value="${areaType.itemCode}"><spring:message code="${areaType.itemValue}"></spring:message></form:option>
 											</c:forEach>
-										</form:select>
-                                   	</div>
-                          		</div>
+									</form:select>
+                          		</div> 
                             </div>
                             <div class="pull-left">
 								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="start_ip"/></span>
+                                    <div class="input-group-btn">
+                                    	<span class="selectpicker form-control" ><spring:message code="start_ip"/></span>
                                    	</div>
-                          		</div>
+                                   	<input name="searchStartIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchStartIp }" />
+                          		</div> 
                             </div>
                             <div class="pull-left">
 								<div class="input-group">
-                                	<div class="input-group-btn">
-										<input name="searchStartIp" type="text" class="form-control input-small" value="${log.searchStartIp }" />
-                                   	</div>
-                          		</div>
-                            </div>
-                            <div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
+                                    <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="end_ip"/></span>
                                    	</div>
-                          		</div>
-                            </div>
-                            <div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<input name="searchEndIp" type="text" class="form-control input-small" value="${log.searchEndIp }" />
-                                   	</div>
-                          		</div>
+                                   	<input name="searchEndIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchEndIp }" />
+                          		</div> 
                             </div>
 							
 							<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp
index e4c14780f..7e2c9325a 100644
--- a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp
@@ -28,7 +28,7 @@
 				console.log(title);
 				if(title != undefined && title != null){
 					if(title.length > 80){
-						$(this).find("td").eq(0).text(title.substring(0,80)+"...");
+						$(this).find("td").eq(0).text(title.substring(0,80));
 					}else{
 						$(this).find("td").eq(0).text(title);
 					}
@@ -69,19 +69,13 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					
 						<div class="col-md-12">
-							<div class="pull-left">
-								<div class="input-group">
-                                	<div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="url"/></span>
-                                   	</div>
-                          		</div>
-                            </div>
                             <div class="pull-left">
 								<div class="input-group">
-                                	<div class="input-group-btn">
-										<input name="searchUrl" type="text" class="form-control input-medium" value="${log.searchUrl }" />
+                                    <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="url"/></span>
                                    	</div>
-                          		</div>
+                                   	<input name="searchUrl" type="text" class="form-control input-medium" maxlength="20" value="${log.searchUrl }" />
+                          		</div> 
                             </div>
 							<div class="pull-left">
 								<div class="input-group">