Merge branch 'newProperty' of http://116.255.223.226:3000/zhangzl/nsgk_web into newProperty

infoport/static/js/project/homesteadDetail.js

@@ -62,7 +62,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             projection: projection,
             target: "container",
             view: new ol.View({
-                // center: mapCenterLocation, // 地图中心坐标
+                center: ol.proj.fromLonLat([dept.lng, dept.lat]), // 地图中心坐标
                 zoom: 16,
                 minZoom: 1, //地图缩小限制
                 maxZoom: 18, //地图放大限制
@@ -94,8 +94,6 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             });
             module.data.map.addLayer(homesteadDetail);
             module.data.map.getView().setCenter(ol.extent.getCenter(homesteadDetail.getSource().getExtent()));
-        } else {
-            module.data.map.getView().setCenter(ol.proj.fromLonLat([dept.lng, dept.lat]));
         }
     }
 

infoport/static/js/project/propertyDetail.js

@@ -60,7 +60,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             projection: projection,
             target: "container",
             view: new ol.View({
-                // center: mapCenterLocation, // 地图中心坐标
+                center: ol.proj.fromLonLat([dept.lng, dept.lat]), // 地图中心坐标
                 zoom: 16,
                 minZoom: 1, //地图缩小限制
                 maxZoom: 18, //地图放大限制
@@ -99,8 +99,6 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             });
             module.data.map.addLayer(permanentLayer);
             module.data.map.getView().setCenter(ol.extent.getCenter(permanentLayer.getSource().getExtent()));
-        } else {
-            module.data.map.getView().setCenter(ol.proj.fromLonLat([dept.lng, dept.lat]));
         }
     }
 

infoport/static/js/project/resourceDetail.js

@@ -60,7 +60,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             projection: projection,
             target: "container",
             view: new ol.View({
-                // center: mapCenterLocation, // 地图中心坐标
+                center: ol.proj.fromLonLat([dept.lng, dept.lat]), // 地图中心坐标
                 zoom: 16,
                 minZoom: 1, //地图缩小限制
                 maxZoom: 18, //地图放大限制
@@ -92,8 +92,6 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             });
             module.data.map.addLayer(resourceDetail);
             module.data.map.getView().setCenter(ol.extent.getCenter(resourceDetail.getSource().getExtent()));
-        } else {
-            module.data.map.getView().setCenter(ol.proj.fromLonLat([dept.lng, dept.lat]));
         }
     }