Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-11-03 ded371830aaa4a149eb33b4363bdf828a9dc7c06

Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/dischargeplan.jsp

@@ -68,7 +68,7 @@
                        <td>

                            <select id="discharge-state" name="discharge-state">

                                <option value="0"><s:text name="Await"/><s:text name="Start_up"/></option>                <!-- 等待启动 -->

                                <option value="1"><s:text name="Discharging"/><s:text name="Time_delay"/></option>        <!-- 放电延时 -->

                                <option value="1" selected="selected"><s:text name="Discharging"/><s:text name="Time_delay"/></option>        <!-- 放电延时 -->

                                <option value="2"><s:text name="Discharging"/><s:text name="Complete"/></option>        <!-- 放电完成 -->

                                <option value="3"><s:text name="Discharging"/><s:text name="Ongoing"/></option>            <!-- 放电进行中 -->

                                <option value="5"><s:text name="Charging"/><s:text name="Ongoing"/></option>            <!-- 充电进行中 -->

@@ -619,9 +619,12 @@
        $('#start-discharge-end-date').val(new Date().format('yyyy-MM-dd'));

        $('#end-discharge-end-date').val(new Date().format('yyyy-MM-dd'));

        

		
        var isNewLoad = true;

        // 省-市-机房-电池组

        var filterLoad;

        $(document).ready(function(){

            var pre_province = getQueryString("province");

            filterLoad = layer.load();

            //页面加载时查询维护区中的枢纽类型

            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

@@ -639,6 +642,9 @@
                        }else{

                            $option.text(data.data[i-1]);

                            $option.attr("value",data.data[i-1]);    

                            if(pre_province == data.data[i-1] && isNewLoad){

                                $option.attr('selected',true);

                            }	
                        }                    

                        $select.append($option);

                    }

@@ -658,6 +664,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_city = getQueryString('city');

            // 请求获取当前省下的市

            $.ajax({     

                type: "post",                 

@@ -675,6 +682,9 @@
                        for(var i=0;i<_data.length;i++){

                            var __data = _data[i];

                            var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                            if(pre_city ==__data.StationName2 && isNewLoad){

                                tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                            }

                            optsList.push(tmp);

                        }

                        // 根据数据生成下拉列表

@@ -697,6 +707,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_county = getQueryString('county');

            // 查询区县

            $.ajax({

                type: 'post',

@@ -716,6 +727,9 @@
                                StationId: __data.StationId

                            };

                            var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                            if(pre_county == __data.StationName5 && isNewLoad){

                                tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                            }

                            optsList.push(tmp);

                        }

                        

@@ -739,6 +753,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_county = getQueryString('county');

            // 查询区县

            $.ajax({

                type: 'post',

@@ -758,6 +773,9 @@
                                StationId: __data.StationId

                            };

                            var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                            if(pre_county == __data.StationName5 && isNewLoad){

                                tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                            }

                            optsList.push(tmp);

                        }

                        

@@ -797,6 +815,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_home = getQueryString('home');

            //var selectvalue=$("#station_name1 option:selected").val();

            //alert(selectvalue);

            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -812,6 +831,9 @@
                            StationId: __data.StationId

                        };

                        var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                        if(pre_home == __data.StationName && isNewLoad){

                            tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);

                        }

                        optsList.push(tmp);

                    }

                    

@@ -820,6 +842,7 @@
                }else{

                    $("#station_name").text('').html('<option>暂无可测机房站点</option>');

                }

                isNewLoad = false;

                findserchByBattGroupNamebystationname();

            });

        }


 gx_tieta/WebRoot/elewarn.jsp

@@ -554,9 +554,13 @@
        eleform.submit();

    }

    

	
    var isNewLoad = true;

    // 省-市-机房-电池组

    var filterLoad;

    $(document).ready(function(){

	
        var pre_province = getQueryString("province");

        filterLoad = layer.load();

        //页面加载时查询维护区中的枢纽类型

        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

@@ -574,6 +578,9 @@
                    }else{

                        $option.text(data.data[i-1]);

                        $option.attr("value",data.data[i-1]);    

                        if(pre_province == data.data[i-1] && isNewLoad){

                            $option.attr('selected',true);

                        }	
                    }                    

                    $select.append($option);

                }

@@ -593,6 +600,7 @@
        if(isLoad) {

            filterLoad = layer.load();

        }

        var pre_city = getQueryString("city");

        // 请求获取当前省下的市

        $.ajax({     

            type: "post",                 

@@ -610,6 +618,9 @@
                    for(var i=0;i<_data.length;i++){

                        var __data = _data[i];

                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                        if(pre_city == __data.StationName2 && isNewLoad){

                            tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                        }

                        optsList.push(tmp);

                    }

                    // 根据数据生成下拉列表

@@ -632,6 +643,7 @@
        if(isLoad) {

            filterLoad = layer.load();

        }

        var pre_county = getQueryString("county");

        // 查询区县

        $.ajax({

            type: 'post',

@@ -651,6 +663,9 @@
                            StationId: __data.StationId

                        };

                        var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                        if(pre_county == __data.StationName5 && isNewLoad){

                            tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                        }

                        optsList.push(tmp);

                    }

                    

@@ -690,6 +705,7 @@
        if(isLoad) {

            filterLoad = layer.load();

        }

        var pre_home = getQueryString('home');

        //var selectvalue=$("#station_name1 option:selected").val();

        //alert(selectvalue);

        $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -705,6 +721,9 @@
                        StationId: __data.StationId

                    };

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    if(pre_home == __data.StationName && isNewLoad){

                        tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);

                    }

                    optsList.push(tmp);

                }

                

@@ -713,6 +732,7 @@
            }else{

                $("#station_name").text('').html('<option>暂无可测机房站点</option>');

            }

            isNewLoad = false;

            findserchByBattGroupNamebystationname();

        });

    }


 gx_tieta/WebRoot/index.jsp

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

                            '<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 county" value="'+data.data.stationName5+'">'+							
                            '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';

                    

                    var list = {

@@ -2542,7 +2543,10 @@
        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+'&home='+home);

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

        var url = skipUrl('control.jsp',province,city,county,home);

        window.open(url);

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

    }



    // 定位到历史数据页面

@@ -2550,27 +2554,49 @@
        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+'&home='+home);

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

        var url = skipUrl('charge-test.jsp',province,city,county,home);

        window.open(url);

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

    }

    

    //定位到告警页面

    function loadToWarnPage() {

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

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

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

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

        var url = skipUrl('elewarn.jsp',province,city,county,home);

        window.open(url);

        // console.info($('.ipt-hide').val());

        var stationId = $('.ipt-hide').eq(1).val();

        window.open('elewarn.jsp?stationId='+stationId);

        //var stationId = $('.ipt-hide').eq(1).val();

        //window.open('elewarn.jsp?stationId='+stationId);

    }



    // 定位到落后单体页面

    function loadToBehindPage() {

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

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

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

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

        var url = skipUrl('taskplan.jsp',province,city,county,home);

        window.open(url);

        // console.info($('.ipt-hide').val());

        var stationId = $('.ipt-hide').eq(1).val();

        window.open('taskplan.jsp?stationId='+stationId);

        //var stationId = $('.ipt-hide').eq(1).val();

        //window.open('taskplan.jsp?stationId='+stationId);

    }



    // 定位到放电延时页面

    function loadToDischargeDelay() {

        var stationId = $('.ipt-hide').eq(1).val();

        window.open('dischargeplan.jsp?stationId='+stationId);

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

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

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

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

        var url = skipUrl('dischargeplan.jsp',province,city,county,home);

        window.open(url);

	
        //var stationId = $('.ipt-hide').eq(1).val();

        //window.open('dischargeplan.jsp?stationId='+stationId);

    }



    // 定位到机房详细信息页面


 gx_tieta/WebRoot/taskplan.jsp

@@ -453,10 +453,12 @@
        });

    }

    

    var isNewLoad = true;

    // 省-市-机房-电池组

    var filterLoad;

    $(document).ready(function(){

        filterLoad = layer.load();

        var pre_province = getQueryString("province");

        //页面加载时查询维护区中的枢纽类型

        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

            data=data.result;

@@ -473,6 +475,9 @@
                    }else{

                        $option.text(data.data[i-1]);

                        $option.attr("value",data.data[i-1]);    

                        if(pre_province == data.data[i-1] && isNewLoad){

                            $option.attr('selected',true);

                        }

                    }                    

                    $select.append($option);

                }

@@ -492,7 +497,7 @@
        if(isLoad) {

            filterLoad = layer.load();

        }

		
        var pre_city = getQueryString("city");

        // 请求获取当前省下的市

        $.ajax({     

            type: "post",                 

@@ -510,6 +515,9 @@
                    for(var i=0;i<_data.length;i++){

                        var __data = _data[i];

                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                        if(pre_city == __data.StationName2 && isNewLoad){

                            tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                        }

                        optsList.push(tmp);

                    }

                    // 根据数据生成下拉列表

@@ -528,6 +536,7 @@
            StationName1:$("#station_name1").val(),

            StationName2:$("#city").val(),

        };

        var pre_county = getQueryString("county");

        // 是否添加等待

        if(isLoad) {

            filterLoad = layer.load();

@@ -551,6 +560,9 @@
                            StationId: __data.StationId

                        };

                        var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                        if(pre_county == __data.StationName5 && isNewLoad){

                            tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                        }

                        optsList.push(tmp);

                    }

                    

@@ -590,6 +602,7 @@
        if(isLoad) {

            filterLoad = layer.load();

        }

        var pre_home = getQueryString("home");

        //var selectvalue=$("#station_name1 option:selected").val();

        //alert(selectvalue);

        $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -605,6 +618,9 @@
                        StationId: __data.StationId

                    };

                    var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

                    if(pre_home == __data.StationName && isNewLoad){

                        tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);

                    }

                    optsList.push(tmp);

                }

                

@@ -613,6 +629,7 @@
            }else{

                $("#station_name").text('').html('<option>暂无可测机房站点</option>');

            }

            isNewLoad = false;

            findserchByBattGroupNamebystationname();

        });

    }