Merge branch 'master' of http://47.92.108.28/caopeng/bigdatainterservice

src/main/resources/mybatis/mapper/xzxt/RelationMapper.xml

@@ -63,14 +63,14 @@
     <select id = "getRelation" parameterType="com.founder.interservice.model.Relation" resultType="com.founder.interservice.model.Relation">
         select
         r.xxzjbh as xxzjbh,
-        r.objectfromtype,
-        r.objectfromtypename,
-        r.objectfromvalue,
-        r.objecttotypename,
-        r.objecttotype,
-        r.objecttovalue,
-        r.timestamp,
-        r.first_timestamp
+        r.objectfromtype as objectfromtype,
+        r.objectfromtypename as objectfromtypename,
+        r.objectfromvalue as objectfromvalue,
+        r.objecttotypename as objecttotypename,
+        r.objecttotype as objecttotype,
+        r.objecttovalue as objecttovalue,
+        r.timestamp as timestamp,
+        r.first_timestamp as first_timestamp
         from relation r
         <where>
             <if test="xxzjbh != null and xxzjbh != ''">

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

@@ -246,11 +246,19 @@ header{
 .new5{margin-left:-237px;margin-top:46px;width:69px;height:73px;}
 .new6{margin-left:150px;margin-top:43px;width:69px;height:73px;/*line-height: 73px;*/}
 .new7{margin-left:-176px;margin-top:-29px;}
+#content1 .new7{
+    margin-left: -194px;
+    margin-top: -115px;
+}
+#content1 .new5{width:141px;height:143px;}
+#content1 .new6{width:162px;height:145px;margin-top:23px;}
+#content1 .others3{margin-top:54px;}
+#content1 .others2{margin-top:44px;}
 .new8{margin-left:-241px;margin-top:-31px;}
-.others4{width: calc(100% - 20px);margin-top:27px;}
+.others4{width: calc(100% - 20px);margin-top:56px;}
 .others5{margin-top: 26px;}
 .news-zx3{margin-left:41px;margin-top:-214px;}
-.w69{width:69px;height:73px;}
+.w69{width:163px;height:158px;}
 .w130{width:130px;height:140px;}
 .w177{width: 191px;
 height: 170px;}

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

@@ -26,8 +26,8 @@
     <!--title start-->
     <!--菜单-->
     <ul class="hx-menu">
-      <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
-      <li class="current" onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>虚拟信息</li>
+      <li onclick="toggle(this)" class="current"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
+      <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>虚拟信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>轨迹信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>背景信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>涉案信息</li>
@@ -58,6 +58,7 @@
           </div>
         </div>--%>
         <!--一条折线对应一条内容，左侧-->
+            <div id ="zjhm" style="display: none">${zjhm}</div>
         <div class="new1 animated pulse"><span class="zdm"><span class="birthdate">姓名：${ryxx.xm}</span></div>
         <!--一条折线对应一条内容，左侧-->
         <div class="new2 animated pulse"><span class="address">性别：${ryxx.xbdm}</span></div>
@@ -73,7 +74,7 @@
         <%--<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>--%>
       </div>
       <div id="content2" class="content" style="display:none;">
-          <c:forEach var="xnxx" items="${relationInList}">
+          <c:forEach var="xnxx" items="${relationList}">
               <c:if test="${not empty xnxx.objectfromtypename}" >
                   <div class="new1 tabs-o animated pulse">
                   <span class="tbs-title">${xnxx.objectfromtypename}</span>
@@ -83,16 +84,14 @@
                   </div>
                   </div>
               </c:if>
-              <c:if test="${not empty xnxx.objecttotypename}" >
-                  <div class="new1 tabs-o animated pulse">
-                  <span class="tbs-title">${xnxx.objecttotypename}</span>
+          </c:forEach>
+              <div class="new1 tabs-o animated pulse">
+                  <span class="tbs-title">身份证号码</span>
                   <div class="tbs-cont">
                       <div class="fl count" onclick="tips(this)">3</div>
-                      <div class="fl ajbh">${xnxx.objecttovalue}</div>
-                  </div>
+                      <div class="fl ajbh">${zjhm}</div>
                   </div>
-              </c:if>
-          </c:forEach>
+              </div>
       </div>
       <div id="content3" class="content" style="display:none;">
         <div class="new1 tabs-o animated pulse" style="margin-left: -298px;">
@@ -253,5 +252,10 @@
   <script type="text/javascript" src="/js/jquery-1.11.3.js"></script>
   <script type="text/javascript" src="/common/layer/layer.js"></script>
   <script type="text/javascript" src="/js/ryhx.js"></script>
+  <script>
+      function getjbxx() {
+          var zjhm = $("#zjhm").val();
+      }
+  </script>
 </body>
 </html>
\ No newline at end of file