实时和历史跳转设置

hdw

2018-10-22 d47e5aa87ae01d82b00a38216e3ac83dea50f3a8

实时和历史跳转设置

 gx_tieta/WebRoot/charge-test.jsp

@@ -3185,8 +3185,10 @@
    $(function() {

        $('body').on('click', '#nav a[href="control.jsp"]', function() {

            var batt = getBattinfById();

            //console.info(batt.StationId);

            $(this).attr('href', 'control.jsp?battgroupId='+BattGroupId+'&stationId='+batt.StationId);

            var province = batt.StationName1;

            var city = batt.StationName2;

            var home = batt.StationName;

            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&home='+home);

        });

    }); 

    


 gx_tieta/WebRoot/control.jsp

@@ -2675,9 +2675,12 @@
        

        // 实时-历史切换定位到具体电池组

        $(function() {

            $('body').on('click', '#nav a[href="charge-test.jsp"]', function() {

            $('body').on('click', '#nav a[href="charge-test.jsp"]', function(event) {

                var batt = getBatt();

                $(this).attr('href', 'charge-test.jsp?battgroupId='+BattGroupId+"&stationId="+batt.StationId);

                var province = batt.StationName1;

                var city = batt.StationName2;

                var home = batt.StationName;

                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);

            });

        });

    


 gx_tieta/WebRoot/index.jsp

@@ -2236,13 +2236,13 @@
                var rs = JSON.parse(result.result);

                if(rs.length != 0) {

                    var data = rs[0];

                    //console.info(data);

                    console.info(data);

                    var content = '<div style="padding:6px;"><span>蓄电池组告警数目：</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">详情>></a></div>'+

                            '<div style="padding:6px;"><span>蓄电池组落后数目：</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">详情>></a></div>'+

                            '<div style="padding:6px;"><span>蓄电池组延时数目：</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">详情>></a></div>'+

                            '<div style="padding:6px"><a href="javascript:loadToRealTime();">实时数据</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">历史数据</a></div>'+

                            '<div style="padding:6px;"><span>地址：</span>'+data.data.Address+'</div>'+

                            '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+

                            '<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+

                            '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+

                            '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';

                    

@@ -2382,18 +2382,18 @@
    }

    // 定位到实时数据页面

    function loadToRealTime() {

        var homeId = $('.ipt-hide.sid').val();

        var home = $('.ipt-hide.home').val();

        var province = $('.ipt-hide.province').val();

        var city = $('.ipt-hide.city').val();

        window.open('control.jsp?province='+province+'&city='+city+'&stationId='+homeId);

        window.open('control.jsp?province='+province+'&city='+city+'&home='+home);

    }



    // 定位到历史数据页面

    function loadToOldTime() {

        var homeId = $('.ipt-hide.sid').val();

        var home = $('.ipt-hide.home').val();

        var province = $('.ipt-hide.province').val();

        var city = $('.ipt-hide.city').val();

        window.open('charge-test.jsp?province='+province+'&city='+city+'&stationId='+homeId);

        window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);

    }

    

    //定位到告警页面


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

@@ -111,7 +111,7 @@
    };



    // 获取folder的一条数据

    _prop.getFolder = function (txt, cla, attr) {

    _prop.getFolder = function (txt, cla,attr) {

        var tmp = {};

        tmp.txt = txt;

        tmp.cla = cla;

@@ -230,7 +230,7 @@
                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

                    treeView.spreadFolder('province', '', firstSpread);

                    treeView.spreadFolder('province', province, firstSpread);

                }else {

                    

                }

@@ -274,7 +274,7 @@
                    treeView.treeView(container, formatData);

                    

                    if(spread) {

                        treeView.spreadFolder('city', '', secondSpread, true);

                        treeView.spreadFolder('city', city, secondSpread, true);

                    }

                }else {

                    

@@ -318,7 +318,7 @@
                    }

                    treeView.treeView(container, formatData);

                    if(spread) {

                        treeView.spreadFolder('home', '', thirdSpread, true);

                        treeView.spreadFolder('home', home, thirdSpread, true);

                    }

                }else {

                    

@@ -395,6 +395,7 @@
                treeView.delProgress(container);

                if(rs.code == 1) {

                    var _data= rs.data;

                    //console.log(_data);

                    var formatData = [];

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

                        var __data = _data[i];

@@ -402,9 +403,12 @@
                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

	        		
                    //console.info(formatData);

                    if(active) {

                        treeView.activeFile('eleGroup', '');

                        var battId = formatData[0].id;

                        location.hash="#"+battId;

                        location.hash = "";

                    }

                }else {