Merge remote-tracking branch 'origin/master'

src/main/resources/static/css/base-ryhx.css

@@ -301,7 +301,7 @@ body .layui-layer-tips i.layui-layer-TipsB{top:-16px;}
     vertical-align: middle;
 }
 .ajbh span{margin-right:8px;}
-.tips-c{padding:5px 10px;}
+.tips-c{padding:5px 10px;max-height:350px;overflow-y:auto;}
 .tips-c p{line-height: 24px;min-width:180px;max-width:300px;}
 .content{width:100%;height:100%;z-index:1000;}
 .bg .content{background:url(../images/people.png) no-repeat center bottom;background-size: auto calc(100% * 0.9);}

src/main/resources/static/js/ryhx.js

@@ -30,6 +30,6 @@ function tips(obj){
         tips:3,
         area: ['332px', 'auto'],
         tipsMore: false,
-        time:2300
+        time:5300
     });
 }
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp

@@ -45,7 +45,7 @@
   <div class="cxtj">
     <form name="wfqdzczlForm" id="form1"  class="easyui-form" data-options="novalidate:true">
         <fieldset>
-            <legend style="height: 46px">
+            <legend style="height: 46px;padding-top: 4px;">
                 <c:if test="${flag == 'bsh'}">
                     <c:if test="${bkxx.xxzjbh ==null ||bkxx.xxzjbh==''}">
                     新增标识号布控信息

src/main/webapp/WEB-INF/jsp/bkxx/gjzzInsert.jsp

@@ -36,7 +36,7 @@
   <div class="cxtj">
     <form name="wfqdzczlForm" id="form1"  class="easyui-form" data-options="novalidate:true">
         <fieldset>
-            <legend style="height: 46px">
+            <legend style="height: 46px;padding-top: 4px;">
                 <c:if test="${bkxx.xxzjbh ==null ||bkxx.xxzjbh==''}">
                     新增轨迹追踪信息
                 </c:if>

src/main/webapp/WEB-INF/jsp/ryhx/bjxx.jsp

@@ -25,7 +25,7 @@
             </c:if>
         </c:forEach>
         <c:if test="${empty relationList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">提示</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">0</div>

src/main/webapp/WEB-INF/jsp/ryhx/gjxx.jsp

@@ -24,7 +24,7 @@
             </div>
         </c:if>
         <c:if test="${empty listHotel}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">疑似落脚点</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${listHotelcount}</div>
@@ -53,7 +53,7 @@
             </div>
         </c:if>
         <c:if test="${empty wbxxList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">网吧名称</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${wbxxListcount}</div>
@@ -74,7 +74,7 @@
             </div>
         </c:if>
         <c:if test="${empty listHotelData}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">入住偏好时间</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${listHotelDatacount}</div>
@@ -95,7 +95,7 @@
             </div>
         </c:if>
         <c:if test="${empty listHotelData}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">退房偏好时间</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${listHotelDatacount}</div>
@@ -124,7 +124,7 @@
             </div>
         </c:if>
         <c:if test="${empty wbxxList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">网吧地址</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${wbxxListcount}</div>
@@ -145,7 +145,7 @@
             </div>
         </c:if>
         <c:if test="${empty wbxxList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">疑似活动区域</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${wbxxListcount}</div>

src/main/webapp/WEB-INF/jsp/ryhx/gxqxx.jsp

@@ -25,7 +25,7 @@
             </c:if>
         </c:forEach>
         <c:if test="${empty relationList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">提示</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">0</div>
@@ -46,7 +46,7 @@
             </div>
         </c:if>
         <c:if test="${empty listOtherHotelData}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">同住人</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">${listOtherHotelDatacount}</div>

src/main/webapp/WEB-INF/jsp/ryhx/saxx.jsp

@@ -25,7 +25,7 @@
             </c:if>
         </c:forEach>
         <c:if test="${empty asjxxList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">案件类别</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">0</div>

src/main/webapp/WEB-INF/jsp/ryhx/swxx.jsp

@@ -25,7 +25,7 @@
             </c:if>
         </c:forEach>
         <c:if test="${empty relationList}">
-            <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+            <div class="new1 tabs-o animated pulse" style="">
                 <span class="tbs-title" style="font-size:14px; margin-left: 13px;">提示</span>
                 <div class="tbs-cont">
                     <div class="fl count" onclick="tips(this)">0</div>

src/main/webapp/WEB-INF/jsp/ryhx/xnxx.jsp

@@ -24,7 +24,7 @@
         </div>
     </c:if>
     <c:if test="${empty relationList}">
-        <div class="new1 tabs-o animated pulse" style="margin-top: -298px;">
+        <div class="new1 tabs-o animated pulse" style="">
             <span class="tbs-title" style="font-size:14px; margin-left: 13px;">提示</span>
             <div class="tbs-cont">
                 <div class="fl count" onclick="tips(this)">0</div>