From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/webapp/page/scheme-helper.html | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/page/scheme-helper.html b/src/main/webapp/page/scheme-helper.html
index 85a8627..4dfb0f0 100644
--- a/src/main/webapp/page/scheme-helper.html
+++ b/src/main/webapp/page/scheme-helper.html
@@ -193,8 +193,11 @@
// map.setViewport(pointArray); //������������
//addlabel();
- //������������
markerManager.reloadCustomOverlays();
+ //������������������������������������������������
+ if(markerManager.isBoundaryState()){
+ switchBoundary.apply(markerManager.menuItems.boundaryMenuItem);
+ }
thatData._regionName = regionName;
markerManager.data._boundary = polygonArray;
if(!!successCallBack && successCallBack instanceof Function){
@@ -299,6 +302,9 @@
}
if(!!markerManager.data['star']){
markerManager.addOverlaysToBmap(markerManager.data['star']);
+ }
+ if(markerManager.isBoundaryState()){
+ markerManager.openBoundary();
}
}
function clearBaiduOverlays() {
@@ -497,9 +503,6 @@
if(!!cityName){
baiduMap.centerAndZoom(cityName);
markerManager.setRegionName(cityName,function () {
- if(markerManager.isBoundaryState()){
- switchBoundary.apply(markerManager.menuItems.boundaryMenuItem);
- }
},function (value) {
alert('������������������'+value+'������������');
})
@@ -512,10 +515,6 @@
baiduMap.centerAndZoom(searchValue);
markerManager.setRegionName(searchValue,
function (searchValue) {
- $('.city-box').val(searchValue);
- if(markerManager.isBoundaryState()){
- switchBoundary.apply(markerManager.menuItems.boundaryMenuItem);
- }
},function (searchValue) {
local.search(searchValue);
});
--
Gitblit v1.8.0