fengxiang
2018-03-15 59efc00b3c872c76f50317513ddd4a1574844960
地图相关资源
2 files modified
33 ■■■■ changed files
src/main/webapp/js/moralmap.js 18 ●●●● patch | view | raw | blame | history
src/main/webapp/view/map.jsp 15 ●●●●● patch | view | raw | blame | history
src/main/webapp/js/moralmap.js
@@ -253,7 +253,7 @@
    moralMap.isPopupBoxShow = function(id) {
        return $(id).css('display') == 'block';
    }
    moralMap.onItermClick = function(index) {
    moralMap.onItermClick = function(index,select) {
        var row = moralMap.getPopupEqu(index);
        if(row['mac']==null){
            alert("mac项未配置,请联系管理员设置");
@@ -265,8 +265,17 @@
            longitude: row['longitude'],
            latitude: row['latitude'],
            version:row['deviceVersion']['version']
        }
        };
        !!select?equ['monitorPointId'] = row["monitorPointId"]:null;
        var equStr = JSON.stringify(equ);
        if(!!select&&select==='chart'){
            if(window['external']&&window['external']['showChartInfo']){
                window['external'].showChartInfo(equStr);
            }else{
                alert(equStr);
            }
        }
        else{
        if(window["console"]!=undefined){
            console.log(equStr);
        }
@@ -274,6 +283,7 @@
            window['external'].showMonitorInfo(equStr);
        }else{
            alert(equStr);
            }
        }
    }
    moralMap.setPopupEqus = function(arr) {
@@ -406,7 +416,9 @@
                                    }
                                    name = name.substring(0, stop1) + "..." + name.substring(stop2, name.length);
                                }
                                var li = "<li id='listview_item_" + e['mac'] + "' onclick=moralMap.onItermClick(" + i + ")><span id='listview_state_" + e['mac'] + "' class='" + state + "'>" + stateName + "</span>" + name + "</li>";
                                var li = "<li id='listview_item_" + e['mac'] + "'><span class='list-chart-span' onclick=moralMap.onItermClick(\"" + i + "\",'chart')><img src='/img/chart.png'></span>"
                                    +"<span id='listview_state_" + e['mac'] + "'class='" + state + "'>" + stateName + "</span>" +
                                    "<div style='cursor: pointer;'  onclick=moralMap.onItermClick(\"" + i + "\")>" + name + "</div></li>";
                                outHtml += li;
                            }
                            outHtml += "</ul>";
src/main/webapp/view/map.jsp
@@ -113,26 +113,31 @@
    clear: both;
    zoom: 1
}
.list-chart-span {
    cursor: pointer;
    background-color: #4c9bf1
}
.list li {
    padding: 10px 0;
    border-bottom: 1px dotted #eee;
    line-height: 40px;
    height: 40px;
    font-size: 20px;
    cursor: pointer;
    /*cursor: pointer;*/
}
.list span{
    float: right;
    position: relative;
    right: 18px;
    right: 5px;
    border-radius:4px;
    width: 70px;
    width: 40px;
    text-align: center;
    height: 24px;
    line-height: 24px;
    font-size: 16px;
    font-size: 14px;
    font-weight: bolder;
    color:  white;
    margin: 10px 0;
    padding:2px 0;
    margin-right: 8px;