Merge remote-tracking branch 'remotes/master/zhuly_bate' into caopeng_bate1

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

@@ -254,8 +254,8 @@
   <script type="text/javascript" src="/js/ryhx.js"></script>
   <script>
       function toggle(obj){
-          var zjhm = $("#zjhm").text();
-          alert("zjhm ="+ zjhm);
+          var urll = location.search; //获取url中"?"符后的字串
+          var zjhm = urll.substring(urll.length-18);
           var url = "";
           var ind=$(obj).index();
           ind=ind+1;
@@ -264,14 +264,12 @@
           $(".right-xx .title").text($(obj).text());
           $(".right-people .content").hide();
           $("#content"+ind).show();
-          if(ind=="0"){
+         /* if(ind=="0"){
               url="/toRyhxJsp?yhCate=00&projectName=00&zjhm="+zjhm;
-              $("#content1").loading(url);
-              alert("url ="+url);
+              $("#content1").load(url);
           }else if(ind=="1"){
               url="/getXnsfxx?yhCate=00&projectName=00&zjhm="+zjhm;
-              $("#content2").loading(url);
-              alert("url ="+url);
+              $("#content2").load(url);
           }else if(ind=="2"){
 
           }else if(ind=="3"){
@@ -284,7 +282,7 @@
 
           }else if(ind=="7"){
 
-          }
+          }*/
       }
   </script>
 </body>