提交内容

hdw

2018-09-26 05c2df61e5d0b9d621617b84a906605fe2c77497

提交内容

 gx_tieta/WebRoot/index.jsp

@@ -93,9 +93,6 @@
        <div id="content">

            <div class="nav-map small">

                <!-- 电池分布图 -->

                <div class="side-bar abs">

                    <div class="lside"></div>

                </div>

                <div class="china-map" id="map">

                    <div class="img-change" style="display:none;">

                        <div class="img-list">

@@ -1597,14 +1594,12 @@
    function createMapDot(map, dotList) {

        // 清空覆盖物和对应的mk点

        mkList = [];

		
        // 遍历查询内容生成对应的图标

        for(var i = 0; i < dotList.length; i++) {

            var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30));    // 设置图片



            var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30));    // 设置图片

            var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);

            

            var mk = new BMap.Marker(pt, {icon:dotIcon});    // 定义marker点

            var mk = new BMap.Marker(pt, {icon: dotIcon});    // 定义marker点

            addMenu(mk, mapDel);

            deletePoint(map, dotList[i].title);

            // 向mk点添加label

@@ -1629,6 +1624,8 @@
            map.addOverlay(mk);

        }

    }

	
    // 
    

    // 删除地图上的指定点

    function deletePoint(map, msg){

@@ -1989,12 +1986,10 @@
            success: function(data){ 

                data = eval('('+data+')');

                var list = eval('('+data.result+')');

                //console.info(list);

                console.log(list.length);

                allStation = new Array();

                if(list!=undefined && list.length>0){

                    for(var i=0;i<list.length;i++){

                        //console.info("第"+i+"次:"+model.data[i].binformation.num);

                        //setAllStation(model.data[i],allStation);

                        var tmp = {

                            binformation:list[i].data,

                            alarm_num:list[i].code,        //告警数目

@@ -2009,27 +2004,6 @@
                    

                    //setTimeout(searchStation, 4000);    

                }

                /* for(var i=0;i<allStation.length;i++){

                    if(allStation[i].low_num>0){                            //落后数目	
                        behindCellList.push(analyzeData(allStation[i]));

                        //console.info(analyzeData(allStation[i]));

                    }else if(allStation[i].alarm_num>0){                    //告警数目

                        warnDotList.push(analyzeData(allStation[i]));

                    }else if(allStation[i].delay_num > 0){                    //延时数目	
                        dischargeDotList.push(analyzeData(allStation[i]));

                    }else{

                        commonDot.push(analyzeData(allStation[i]));

                    }

                }

				
                // 清空覆盖物和对应的mk点

                map.clearOverlays();

                mkList = [];

				
                addCommonDotHome(commonDot);

                createWarnDot(map, warnDotList);

                dischargeTimeOut(map, dischargeDotList);

                behindDotCell(map, behindCellList); */

            }                 

        });

    }

@@ -3065,74 +3039,5 @@
            img.attr('src', navImg);

        }

    }

    // siderbar模块

    $(function() {

        var TreeView = GLOBAL.pages.TreeView;

        var first = GLOBAL.pages.siderbar.first;    // 一级导航

        var second = GLOBAL.pages.siderbar.second;    // 二级导航

        var thirdFile = GLOBAL.pages.siderbar.thirdFile;    // 三级导航

        var treeView = new TreeView($('.side-bar .lside'));

        // 设置容器可拖动

        $('.side-bar').resizable({

            handles: 'e',

            maxWidth: 520,

            minWidth: 200,

            alsoResize: $('.side-bar .lside'),

            resize:function() {

                treeView.setContainer();

            }

        });

		
        // 生成一级导航-省

        first(treeView, treeView.container);

		
        // 省->市

        treeView.ele.on('click', '.province', function() {

            var province = $(this).data('attr');

            second(treeView, $(this).parent(), province);

        });

		
        // 市->机房

        treeView.ele.on('click', '.city', function() {

            var city = $(this).data('attr');

            thirdFile(treeView, $(this).parent(), city);

        });

		
        // 点击机房定位

        treeView.ele.on('click', '.home', function() {

            var home = $(this).data('attr');

            var dev_id = home.FBSDeviceId;

			
            searchStationById(home.StationId);

            // 根据设备id设置不同的图标

            if(eType.regType(dev_id, eType.type.equip61850)) {

                changeMapImgDesc($('#mapImgDesc'), '61850');

            }else {

                changeMapImgDesc($('#mapImgDesc'));

            }

        });

		
        $('#map').on('dblclick', function() {

            setLside();

            treeView.setContainer();

        });

		
        // 设置lside的高度

        setLside();

        treeView.setContainer();

        setLside();

        $(window).resize(function() {

            setLside();

        });

		
        // 设置lside的高度函数

        function setLside() {

            var sideBar = $('.side-bar');

            var lside = $('.side-bar .lside');

            // 设置宽高

            lside.width(sideBar.width());

            lside.height(sideBar.height());

        }

    });

    </script> 

</html>


 gx_tieta/src/com/fgkj/services/BattMap_informationService.java

@@ -100,7 +100,7 @@
                state="item-normal";

                ServiceModel model=new ServiceModel();

                BattMap_information binformation = list.get(i);

                if(binformation.getFBSDeviceId()/100000==6185){

                /*if(binformation.getFBSDeviceId()/100000==6185){

                    BattInf binf=new BattInf();

                    binf.setFBSDeviceId(binformation.getFBSDeviceId());

                    state=(new Fbs9100_stateImpl().seachDevNow(binf));

@@ -119,7 +119,7 @@
                            }

                        }

                    }

                }

                }*/

                model.setData(list.get(i));

                model.setCode(numAlarm);        //告警总数

                model.setSum(numBadBatt);        //落后总数