提交内容

hdw

2018-10-13 6f027ced715654072cb57d4c40daafaf8da7b1ce

提交内容

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -462,36 +462,36 @@
                            

                            // 停电

                            if(_data.station_stat_poff) {

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'red');

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'停电异常'});

                            }else {

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'green');

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '正常'});

                            }

                            

                            arrTd[index++]=_data.station_poff_start_time //停电开始时间

                            

                            // 发电

                            if(_data.station_stat_fadian) {

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'red'); //发电

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '发电异常'}); //发电

                            }else {

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'green'); //发电

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '正常'}); //发电

                            }

                            

                            arrTd[index++]=_data.station_fadian_start_time;//发电开始时间

                            

                            // 掉站

                            if(_data.station_stat_diaozhan) {

                                arrTd[index++]= create_ali_font('icon-dianchi', 'red');

                                arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '已掉站'});

                            }else {

                                arrTd[index++]= create_ali_font('icon-dianchi4', 'green');

                                arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '正常'});

                            }

                            

                            arrTd[index++]=_data.station_diaozhan_start_time;//掉站开始时间

                            

                            // 开门关门异常

                            if(_data.station_stat_dooropen) {

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'red');

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '开门'});

                            }else {

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'green');

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '关门'});

                            }

                            

                            arrTd[index++]=_data.station_dooropen_start_time;//开门关门异常时间

@@ -617,21 +617,11 @@
            }

            var ArrTd="";

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

            {	
                if((i+1)%eleTh.length==4){   //停电

                    //console.info(eleTd.eq(i).find('i class').find('style));

                    //if(eleTd.eq(i).find('style').is('color: rgb(0, 128, 0)'){

                    //    console.info("停电");

                        //ArrTd+=""

                    //}

                    //console.info(eleTd.eq(i).outerHTML);

                    ArrTd+="停电"+"&";

                }else if((i+1)%eleTh.length==6){//发电

                    ArrTd+=eleTd.eq(i).text()+"&";

                }else if((i+1)%eleTh.length==8){//掉站

                    ArrTd+=eleTd.eq(i).text()+"&";

                }else if((i+1)%eleTh.length==10){//开门、关门

                    ArrTd+=eleTd.eq(i).text()+"&";

            {

                var _index = (i+1)%eleTh.length;

                // 4--停电 6-	
                if(_index==4 || _index==6 || _index==8 || _index==10){   //停电

                    ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";

                }else{

                     ArrTd+=eleTd.eq(i).text()+"&";

                }


 gx_tieta/WebRoot/index.jsp

@@ -1583,7 +1583,7 @@
        

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

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

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

            var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].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点


 gx_tieta/WebRoot/pages/js/common.js

@@ -426,12 +426,16 @@
})(jQuery, window, document, GLOBAL);



// 生成阿里图标的元素

function create_ali_font(cla, color) {

function create_ali_font(cla, color, data) {

    var i = $('<i class="icon iconfont"></i>');

    i.addClass(cla);

    i.css({

        'color': color

    });

    Object.keys(data).forEach(function(key) {

        var attr = 'data-'+key

        i.attr(attr, data[key]);

    });

    // 获取字符串

    var outerHTML = i[0].outerHTML;

    return outerHTML;