容器位置调整

潘钊
1 parent bcbe1edb
Showing 1 changed file with 11 additions and 12 deletions
src/main/resources/static/index.html
@@ -178,17 +178,16 @@ tr.row-active td {
             </div>
         </div>
         <div class="page-content-wrapper">
-            <div class="page-content">
-                <div id="pjax-container" ></div>
-                <div id="route-container">
+                <div id="pjax-container" class="page-content"></div>
+                
+               <div id="route-container">
                     <div ng-app="ScheduleApp">
                         <div ng-controller="ScheduleAppController">
                             <div ui-view class="fade-in-up"> </div>
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
+        </div> 
     </div>
 <script id="menu_list_temp" type="text/html">
@@ -272,10 +271,10 @@ tr.row-active td {
 <!-- 地图相关 -->
 <!-- 百度 -->
-<!-- <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>
+<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" ></script>
-高德
-<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>  -->
+<!-- 高德  -->
+<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <script src="/assets/js/common.js"></script>
 <!-- d3 -->
@@ -381,13 +380,13 @@ $(function(){
 	}
 	function showPjax(){
-		$(angJsContainer).hide();
-		$(pjaxContainer).show();
+		$(angJsContainer).removeClass('page-content').hide();
+		$(pjaxContainer).addClass('page-content').show();
 	}
 	function showAngJs(){
-		$(pjaxContainer).html('').hide();
-		$(angJsContainer).show();
+		$(pjaxContainer).html('').removeClass('page-content').hide();
+		$(angJsContainer).addClass('page-content').show();
 	}
 	function activeLeftMenu(item){