Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

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

@@ -197,7 +197,7 @@
                    }
                    break;
            }
            if(clickHandle.counter>=4 ){
            if(clickHandle.counter>=5 ){
                var msg = "当前状态为:【"+handleName+"】,可以通过【鼠标右键】切换状态"
                Lobibox.notify('info', {
                    size: 'mini',
@@ -262,7 +262,6 @@
            }));
            marker.addContextMenu(markerMenu);
        }

        function addMpoint(point) {
            var option = {
                enableDragging: true