修改内容

hdw

2018-10-25 bb65f33c9fdff40844f17e95e3e75aed2b42bda2

修改内容

 gx_tieta/WebRoot/charge-test.jsp

@@ -419,10 +419,10 @@
                    <td><s:text name="Computer_room_IP"/></td>                <!-- 机房IP -->

                    <td id="StationIP"></td>

                </tr>

                <!-- <tr>

                    <td><s:text name="Batt_group"/>ID</td>                                电池组ID

                <tr>

                    <td><s:text name="Batt_group"/>ID</td>                                <!-- 电池组ID -->

                    <td id="batt_group_id"></td>

                </tr> -->

                </tr>

                <tr>

                    <td><s:text name="Battery_name"/></td>                    <!-- 电池组名称 -->

                    <td id="BattGroupName"></td>

@@ -3498,18 +3498,23 @@
                if(model.code == 1){

                    //console.info(model.data);

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

                        if(model.data[i].batt_test_type == 3){

                        var _data = model.data[i];

                        if(_data.batt_test_type == 3){

                            arr.push({

                                note: model.data[i].note,

                                val:model.data[i].BattGroupId,

                                fbs: model.data[i].batt_test_tlong,

                                note:_data.note,

                                val:_data.BattGroupId,

                                province: _data.stationName1,

                                city: _data.stationName2,

                                home: _data.stationName,

                                isCharge:0

                            });

                        }else if(model.data[i].batt_test_type == 2){

                        }else if(_data.batt_test_type == 2){

                            arr.push({

                                note: model.data[i].note,

                                val:model.data[i].BattGroupId,

                                fbs: model.data[i].batt_test_tlong,

                                note: _data.note,

                                val: _data.BattGroupId,

                                province: _data.stationName1,

                                city: _data.stationName2,

                                home: _data.stationName,

                                isCharge:1

                            });

                        }

@@ -3523,75 +3528,6 @@
                

            }                

        });

    }

	
    // 生成充放电监测模块内容

    function createBattListen(ele, list) {

        //console.info(list);

        ele.text("");

        var discharge_num = 0;

        var charge_num = 0;

        var ul = $('<ul></ul>');

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

            var li = "";

            if(list[i].isCharge) {

                li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'电池组充电测试!</a></li>');

                charge_num++;

            }else {

                li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'电池组放电测试!</a></li>');

                discharge_num++;

            }

            ul.append(li);

        }

        $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);

        $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);

        ele.append(ul);

    }

    // 点击电池充放电监测列表触发事件

    $(function() {

        var batt_list = $('#ele_content .batt-listen .batt-list');

        batt_list.on('click', 'a', function(){

            var fbsId = $(this).attr('fbs');

            var isSpecial = regFbsId(fbsId);

            $('.special-mon-data').removeClass('show');

            batt_list.find('a').removeClass('active');

            $(this).addClass('active');

            BattGroupId=$(this).attr("value");

            locationBattPos($(this).attr('note'), $(this).attr('value'));

            if(isSpecial) {

				
            }else {

                clearfourPicture();

            }

        });

    });

	
    function BattlocationById(battid){

        if(battid!=undefined){

            BattGroupId = battid;

            $('#lside a').css({'background-color':'#fff'});

            //获得一级菜单并展示二级菜单

            var secTag =$('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().next();

            var secTagA = $('#'+battid).parent().parent().siblings().first();

            //console.info(secTagA.text()+'******');

            if(secTagA.text().trim().length == 0) {

                secTagA.hide();

            }

            secTag.show();

            //$('#'+thr_id).parent().parent().siblings().first().parent().parent().siblings().first().next().show();

            //获得二级菜单并展示三级菜单

            $('#'+battid).parent().parent().siblings().first().next().show();

            $('#'+battid).css('background-color','#9bbaf3');

            //一级菜单展开样式

            $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').removeClass("down");

            $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').addClass("up");

            $('#'+battid).parent().parent().siblings().first().children('.mark').text('-');

            $('#'+battid).parent().parent().siblings().first().children('.mark').addClass('black');

            //alert($('#'+thr_id).parent().parent().siblings().first().text());

            location.hash="#"+battid;

            location.hash = '';

            $('#'+battid).click();

        }

    }

    

    //跳转到指定的电池组统计分析查询

@@ -4614,6 +4550,7 @@
        var second = GLOBAL.pages.siderbar.second;    // 二级导航

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

        var fourth = GLOBAL.pages.siderbar.fourth;    // 四级导航

        var localSideBar = GLOBAL.pages.siderbar.localSideBar;    // 定位机房

        var treeView = new TreeView($('#lside'));

        $('#lside').width($('#ele_content').width());

        treeView.setContainer();

@@ -4685,6 +4622,24 @@
                searchAll_lowAction();            //获取阀值

            }

            

            // 电池充放电数据监控

            var batt_list = $('.batt-listen .batt-list');

            batt_list.on('click', 'a', function(){

                batt_list.find('a').removeClass('active');

                $(this).addClass('active');

                var battInfo = $(this).parent().data('attr');	
				
                var tmp = {

                    province: battInfo.province,

                    city: battInfo.city,

                    home: battInfo.home,

                    homeid: battInfo.note,

                    battid: battInfo.val

                };

                console.log(tmp);

                localSideBar(treeView, treeView.container, tmp);

            });

			
            

            // 设置记录的笔数为-1

            $('#testrecordcout').val('-1');


 gx_tieta/WebRoot/control.jsp

@@ -286,10 +286,10 @@
                    <td><s:text name="Computer_room_IP"/></td>                <!-- 机房IP -->

                    <td id="StationIP"></td>

                </tr>

                <!-- <tr>

                    <td><s:text name="Batt_group"/>ID</td>                                电池组ID

                <tr>

                    <td><s:text name="Batt_group"/>ID</td>                                <!-- 电池组ID -->

                    <td id="batt_group_id"></td>

                </tr> -->

                </tr>

                <tr>

                    <td><s:text name="Battery_name"/></td>                    <!-- 电池组名称 -->

                    <td id="BattGroupName"></td>

@@ -863,7 +863,7 @@
        

        //var eMenuWidth = $('#echarts_menu').width();

        //$('#echarts_menu').width(eMenuWidth);

        var isnotshowvalue=false;            //是否显示柱状值

        var isnotshowvalue=true;            //是否显示柱状值

        var mon_res_list;            //电池内阻数组

        var mon_vol_list;            //电池电压数组

        var mon_ser_list;            //电池电导数组

@@ -2742,29 +2742,7 @@
        });

    }

    

    //生成充放电监测模块内容

    function createBattListen(ele, list) {

        ele.text("");

        var discharge_num = 0;

        var charge_num = 0;

        var ul = $('<ul></ul>');

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

            var li = "";

            if(list[i].isCharge) {

                li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组充电测试!</a></li>');

                charge_num++;

            }else {

                li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组放电测试!</a></li>');

                discharge_num++;

            }

			
            li.data('attr', list[i]);

            ul.append(li);

        }

        $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);

        $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);

        ele.append(ul);

    }

	
    // 点击电池充放电监测列表触发事件

    $(function() {

        

@@ -3339,7 +3317,8 @@
                    searchBtsBattInfoByStation(temp);    // 查询机房信息

                    searchBTSTestParam({

                        num: CMD_BTS_GetDischargeParm,

                        dev_id: batt.FBSDeviceId

                        dev_id: batt.FBSDeviceId,

                        TestCmd: 0

                    });

                    BTS_popup.showPopup();

                    

@@ -3415,7 +3394,8 @@
            $('#btn_flush').click(function (){

                var temp = {

                    dev_id:$('#dev_id').val(),

                    num:CMD_BTS_GetDischargeParm

                    num:CMD_BTS_GetDischargeParm,

                    TestCmd: 0

                };

                searchBTSTestParam(temp);

            });

@@ -3440,7 +3420,8 @@
                // 构造启动条件

                var temp = {

                    num: CMD_BTS_Start,

                    dev_id: $('#dev_id').val()

                    dev_id: $('#dev_id').val(),

                    TestCmd: $('#discharge_type').val()

                };

                sendCmdToBTSDev(temp);

            });

@@ -3973,6 +3954,14 @@
                    }

                    mygraph.ischange = 1;                //重新绘制拓扑图

                    

                    // 负载电流

                    var loadCurr = batt.Load_curr+'A';

                    changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

					
                    // 最大核容电流

                    var disCurrMax = batt.DisCurrMax+'A';

                    changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流：'+disCurrMax});

					
                    getBattStr();

                    searchBattAlarmParam();                //查询电池告警参数

                    clearInterval(time);

@@ -3989,8 +3978,8 @@
                       BattGroupId=$(this).attr("id");

                       var disX=(e||event).clientX+10;            //得到鼠标点击X的位置

                      var disY=(e||event).clientY+10;            //得到鼠标点击Y的位置

                      var scrollY=$("body").scrollTop();        //获取浏览器滚动的高度

				
                      var scrollY=$(window).scrollTop();        //获取浏览器滚动的高度

                    console.log(scrollY);

                      var oRightMenu=document.getElementById("right_menu");

                      

                      $(this).click();

@@ -3999,9 +3988,10 @@
                      $("#right_menu").show();

                      $("#right_menu .more_menu").hide();

                      $("#right_menu .angle").hide();

                      console.log(disX+"***"+disY);

                      //使菜单跟随鼠标位置

                      oRightMenu.style.left=disX+'px';

                      oRightMenu.style.top=disY+scrollY+'px';

                      oRightMenu.style.left= disX+'px';

                      oRightMenu.style.top= disY+scrollY+'px';

                      

                      setPosition($("#right_menu"),disX, disY);

                      


 gx_tieta/WebRoot/index.jsp

@@ -83,6 +83,12 @@
            overflow-y: auto; 

            overflow-x: hidden;

        }

        .BMapLib_bubble_content a {

            color: #2A3AF0;

        }

        .BMapLib_bubble_content a:hover {

            text-decoration: underline;

        }

        body .layui-layer-dialog {

            min-width:400px;

        }

@@ -1763,7 +1769,7 @@
    

    function showMapPanel(target, warnList) {

        var point = target.point;

        console.log(target.getLabel());

        //console.log(target.getLabel());

        var searchInforWin = null;

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

            if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {

@@ -2108,7 +2114,7 @@
    

    var allStation = [];

    var mapPages = {

        pageSize:100,                 // 每页的行数

        pageSize:1000,                 // 每页的行数

        pageCurr:1,                  // 当前页码数

        pageAll:1,                    // 数目

        pageNum: 0,

@@ -2197,6 +2203,7 @@
            data: "json="+JSON.stringify(mapPages),

            success: function(result) {

                var data = JSON.parse(result.result);

                console.log(data);

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

                    var _data = data[i];

                    var _list =  formatUpdateStation(_data);

@@ -2246,7 +2253,6 @@
            alert('面板信息查询失败！');

            return;

        }

		
        var temp = {

            StationId: stationInfo.sId

        };


 gx_tieta/WebRoot/js/base.js

@@ -387,7 +387,7 @@
                document.getElementById("StationId").innerHTML=data.StationId;                    //机房id

                document.getElementById("StationName").innerHTML=data.StationName;                //机房名称

                document.getElementById("StationIP").innerHTML=data.StationIp;                    //机房ip

                //document.getElementById("batt_group_id").innerHTML=data.BattGroupId;            //电池组ip

                document.getElementById("batt_group_id").innerHTML=data.BattGroupId;            //电池组ip

                

                document.getElementById("BattGroupName").innerHTML=data.BattGroupName;            //电池组名称

                document.getElementById("BattGroupNum").innerHTML=data.BattGroupNum;            //电池组序号


 gx_tieta/WebRoot/js/dischargetest/bts.js

@@ -239,7 +239,8 @@
                noContent.showNoContent("修改测试参数成功");

                var temp = {

                    num:CMD_61850_GETPARAM,

                    dev_id:param.dev_id

                    dev_id:param.dev_id,

                    TestCmd: 0

                };

                searchBTSTestParam(temp,true);                //重新读取一次测试参数

                


 gx_tieta/WebRoot/js/elecircle.content.js

@@ -314,42 +314,42 @@
    });

    

    // 二极管上方的横线

    eleCircle.drawLine({

        startX: 380,

        startY: 135,

        endX: 430,

        endY: 135,

        strokeStyle: '#FF0000',

    });

//    eleCircle.drawLine({

//        startX: 380,

//        startY: 135,

//        endX: 430,

//        endY: 135,

//        strokeStyle: '#FF0000',

//    });

    // 二极管上方的竖线

    eleCircle.drawLine({

        startX: 430,

        startY: 135,

        endX: 430,

        endY: 160,

        strokeStyle: '#FF0000',

    });

//    eleCircle.drawLine({

//        startX: 430,

//        startY: 135,

//        endX: 430,

//        endY: 160,

//        strokeStyle: '#FF0000',

//    });

    

    

    

    

    // 二极管下方的竖线

    eleCircle.drawLine({

        startX: 430,

        startY: 220,

        endX: 430,

        endY: 250,

        strokeStyle: '#FF0000',

    });

//    eleCircle.drawLine({

//        startX: 430,

//        startY: 220,

//        endX: 430,

//        endY: 250,

//        strokeStyle: '#FF0000',

//    });

    

    // 二极管下方的横线

    eleCircle.drawLine({

        startX: 430,

        startY: 250,

        endX: 380,

        endY: 250,

        strokeStyle: '#FF0000',

    });

//    eleCircle.drawLine({

//        startX: 430,

//        startY: 250,

//        endX: 380,

//        endY: 250,

//        strokeStyle: '#FF0000',

//    });

    

    

    // BATC+端上方的虚线

@@ -418,11 +418,11 @@
    });

    

    // 绘制二极管Do

    eleCircle.drawDiode({

        startX: 430,

        startY: 160,

        id: 'diode'

    });

//    eleCircle.drawDiode({

//        startX: 430,

//        startY: 160,

//        id: 'diode'

//    });

    

    // 绘制ko开关

    eleCircle.drawSwitchBtn({

@@ -528,6 +528,22 @@
        id: 'eleCurrent'

    });

    

    // 负载电流

    eleCircle.drawText({

        id: 'loaderCurr',

        startX: 600,

        startY: 50,

        name: '最大负载电流：0A',

    });

	
    // 最大核容电流

    eleCircle.drawText({

        id: 'disCurrMax',

        startX: 600,

        startY: 70,

        name: '最大核容电流：0A',

    });

	
    // 浮充电流方向

    var floatCurr = [

         {


 gx_tieta/WebRoot/pages/js/pages/siderbar.js

@@ -625,4 +625,28 @@
            }

        });

    }

})(jQuery, window, document, GLOBAL);
})(jQuery, window, document, GLOBAL);



//生成充放电监测模块内容

function createBattListen(ele, list) {

    ele.text("");

    var discharge_num = 0;

    var charge_num = 0;

    var ul = $('<ul></ul>');

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

        var li = "";

        if(list[i].isCharge) {

            li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组充电测试!</a></li>');

            charge_num++;

        }else {

            li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组放电测试!</a></li>');

            discharge_num++;

        }

		
        li.data('attr', list[i]);

        ul.append(li);

    }

    $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);

    $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);

    ele.append(ul);

}