diff --git a/czl-screen/js/map_amplify.js b/czl-screen/js/map_amplify.js index 0c692b8..8938acb 100644 --- a/czl-screen/js/map_amplify.js +++ b/czl-screen/js/map_amplify.js @@ -145,6 +145,8 @@ function initMap(){ // 百度地图API功能 map = new BMap.Map("allmap"); // 创建Map实例 map.centerAndZoom(new BMap.Point(selectLon !=""?selectLon:112.98,selectLat !="" ?selectLat:28.19), level != "" ? parseInt(level): 8) // 初始化地图,设置中心点坐标和地图级别 + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); //添加地图类型控件 map.addControl(new BMap.MapTypeControl({ mapTypes:[ @@ -203,6 +205,8 @@ function setPlace(){ var pp = local.getResults().getPoi(0).point; //获取第一个智能搜索的结果 console.log('经度:'+pp.lng, '纬度:'+pp.lat); map.centerAndZoom(pp, 18); + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); map.addOverlay(new BMap.Marker(pp)); //添加标注 } var local = new BMap.LocalSearch(map, { //智能搜索 @@ -215,6 +219,8 @@ function theLocation(){ var city = document.getElementById("cityName").value; if(city != ""){ map.centerAndZoom(city,11); // 用城市名设置地图中心点 + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); } } //查询地图杆塔start diff --git a/czl-screen/js/map_data.js b/czl-screen/js/map_data.js index a6e5c42..a5d62ce 100644 --- a/czl-screen/js/map_data.js +++ b/czl-screen/js/map_data.js @@ -66,6 +66,8 @@ function initMap(){ // 百度地图API功能 map = new BMap.Map("allmap"); // 创建Map实例 map.centerAndZoom(new BMap.Point(selectLon !=""?selectLon:112.98,selectLat !="" ?selectLat:28.19), 15); // 初始化地图,设置中心点坐标和地图级别 + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); //添加地图类型控件 map.addControl(new BMap.MapTypeControl({ mapTypes:[ @@ -131,6 +133,8 @@ function setPlace(){ var pp = local.getResults().getPoi(0).point; //获取第一个智能搜索的结果 console.log('经度:'+pp.lng, '纬度:'+pp.lat); map.centerAndZoom(pp, 18); + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); map.addOverlay(new BMap.Marker(pp)); //添加标注 } var local = new BMap.LocalSearch(map, { //智能搜索 @@ -143,6 +147,8 @@ function theLocation(){ var city = document.getElementById("cityName").value; if(city != ""){ map.centerAndZoom(city,11); // 用城市名设置地图中心点 + map.setMinZoom(6); // 设置最小缩放级别 + map.setMaxZoom(14); } } //查询地图杆塔start diff --git a/czl-screen/login.html b/czl-screen/login.html index ac75563..122bcb0 100644 --- a/czl-screen/login.html +++ b/czl-screen/login.html @@ -120,10 +120,10 @@ //请求成功 success: function (result) { console.log(result); - $("#uuid").val(result.uuid); - $("#vCode").attr("src", "data:image/png;base64," + result.img); + $("#uuid").val(result.obj.uuid); + $("#vCode").attr("src", "data:image/png;base64," + result.obj.img); code = result.resMsg; - uuid = result.uuid; + uuid = result.obj.uuid; //fastLogin(); }, //请求失败,包含具体的错误信息 diff --git a/czl-screen/pages/home/map.html b/czl-screen/pages/home/map.html index 41bb378..2e2d19a 100644 --- a/czl-screen/pages/home/map.html +++ b/czl-screen/pages/home/map.html @@ -12,6 +12,7 @@ + diff --git a/czl-screen/pages/home/map_amplify.html b/czl-screen/pages/home/map_amplify.html index 89dcb7c..c627799 100644 --- a/czl-screen/pages/home/map_amplify.html +++ b/czl-screen/pages/home/map_amplify.html @@ -54,7 +54,8 @@ - + + diff --git a/czl-web/pages/project/ProjectMap.html b/czl-web/pages/project/ProjectMap.html index f248975..140ae3e 100644 --- a/czl-web/pages/project/ProjectMap.html +++ b/czl-web/pages/project/ProjectMap.html @@ -12,7 +12,8 @@ - + + 地图展示