Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-22 d10235124e675103c1a27fb5aeff337493413cc2

 src/main/webapp/page/scheme-helper.html

@@ -39,6 +39,11 @@
    .city-box {
        width: 80px;
    }
    .set-city-box {
        display: inline-block;
        position: relative;
        bottom: -2px;
    }
    .anchorBL {
        display: none;
    }
@@ -67,7 +72,11 @@
        <table>
            <tr>
                <td colspan="5"  class="click-handle-title">
                    当前城市：<input class="city-box" type="input" />&nbsp;<a id="setCityBtn" style=" text-decoration:underline; color:#00F;cursor:pointer;">设置</a>
                    当前城市：
                    <span id="city-name" style="width: 60px;height:20px;border-bottom:solid #1b1b1b 1px;display:inline-block">
                        &nbsp;
                    </span>
                    <div class="set-city-box"><input class="city-box" type="input" />&nbsp;<a id="setCityBtn" style=" text-decoration:underline; color:#00F;cursor:pointer;">设置</a></div>
                </td>
            </tr>
            <tr>
@@ -169,6 +178,9 @@
                        }
                        return ;
                    }
                    //设置城市名称
                    $('#city-name').html(regionName);
                    $('.city-box').val('');
                    map.setCurrentCity(regionName); // 设置地图显示的城市 此项是必须设置的
                    // var pointArray = [];
                    var polygonArray = [];
@@ -180,8 +192,12 @@
                    }
                    // 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){
@@ -286,6 +302,9 @@
            }
            if(!!markerManager.data['star']){
                markerManager.addOverlaysToBmap(markerManager.data['star']);
            }
            if(markerManager.isBoundaryState()){
                markerManager.openBoundary();
            }
        }
        function clearBaiduOverlays() {
@@ -484,9 +503,6 @@
                if(!!cityName){
                    baiduMap.centerAndZoom(cityName);
                    markerManager.setRegionName(cityName,function () {
                    if(markerManager.isBoundaryState()){
                        switchBoundary.apply(markerManager.menuItems.boundaryMenuItem);
                    }
                    },function (value) {
                        alert('未找到名为【'+value+'】的城市');
                    })
@@ -499,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);
                    });