Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

 src/main/webapp/view/map.jsp

@@ -303,7 +303,7 @@
    var mapType = getUrlParam("mapType");
    var mapOption = {};
    if(!!mapType && !!eval(mapType)) {
        mapOption["mapType"] = eval(mapType);
        mapOption["mapType"] = jieval(mapType);
    }
   //通过地区名称加载地图
   moralMap.mapInit(params["regionName"],mapOption);
@@ -396,10 +396,10 @@
                           if(window["console"]!=undefined){
                              console.log(equStr);
                           }
                                 if(!!window['external']&&window['external']['callWin']){
                                 if(!!window['external']&&!!window['external']['callWin']){
                                        window['external'].callWin(equStr);
                           }else
                            if(!!window['external']&&window['external']['showMonitorInfo']){
                            if(!!window['external']&&!!window['external']['showMonitorInfo']){
                                window['external'].showMonitorInfo(equStr);
                             }else{
                                alert(equStr);
@@ -486,10 +486,10 @@
            var obj = {};
            obj['methodName'] = 'showChart';
            var objStr = JSON.stringify(obj);
            if(!!window['external']&&window['external']['callWin']){
            if(!!window['external']&&!!window['external']['callWin']){
                window['external'].callWin(objStr);
            }else
            if(!!window['external']&&window['external']['showChartInfo']){
            if(!!window['external']&&!!window['external']['showChartInfo']){
                window['external'].showChartInfo("");
            }else{
                alert(objStr);