Merge remote-tracking branch 'remotes/master/master'

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

@@ -277,7 +277,12 @@ body .layui-layer-tips .layui-layer-content{/* color:#000; */}
 .layui-layer-tips .layui-layer-content{background:rgb(10, 135, 165) !important;color:#fff;}
 body .layui-layer-tips i.layui-layer-TipsB, .layui-layer-tips i.layui-layer-TipsT{border-top-color: transparent; !important;border-top-style: solid;border-right-color: transparent !important;border-right-style: inherit;line-height: 0;border-color: transparent transparent rgb(10, 135, 165) transparent;border-style: dashed dashed solid dashed;}
 body .layui-layer-tips i.layui-layer-TipsB{top:-16px;}
-
+#content2 .new1:nth-child(1){margin-left: -296px;margin-top: -202px;}
+#content2 .new1:nth-child(2){margin-left: -319px;margin-top: -80px;}
+#content2 .new1:nth-child(3){margin-left: 69px;margin-top: -202px;}
+#content2 .new1:nth-child(4){margin-left: 90px;margin-top: -69px;}
+#content2 .new1:nth-child(5){margin-left: -347px;margin-top: 49px;}
+#content2 .new1:nth-child(6){margin-left: 67px;margin-top: 68px;}
 /**/
 /* @media screen and (max-width: 1600px){ 
 body{font-size: 10px;}

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

@@ -73,7 +73,7 @@
         <div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>
       </div>
       <div id="content2" class="content" style="display:none;">
-          <div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
+          <div class="new1 tabs-o animated pulse">
               <span class="tbs-title">${relationFilter.name}</span>
               <div class="tbs-cont">
                   <div class="fl count" onclick="tips(this)">3</div>
@@ -81,7 +81,7 @@
               </div>
           </div>
           <c:forEach var="xnxx" items="${relationInList}">
-          <div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
+          <div class="new1 tabs-o animated pulse">
           <span class="tbs-title">${xnxx.objectfromtypename}</span>
           <div class="tbs-cont">
               <div class="fl count" onclick="tips(this)">3</div>