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

hdw

2018-11-13 2176a2cc998001cba87bf2c54cbb9809f7cc9f87

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

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -339,11 +339,13 @@
        }

        

        

        
        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;

@@ -360,6 +362,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);

                    }

@@ -378,6 +383,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_city = getQueryString('city');

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

            $.ajax({     

                type: "post",                 

@@ -395,6 +401,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);

                        }

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

@@ -417,6 +426,7 @@
            if(isLoad) {

                filterLoad = layer.load();

            }

            var pre_county = getQueryString('county');

            // 查询区县

            $.ajax({

                type: 'post',

@@ -436,6 +446,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);

                        }

                        

@@ -478,6 +491,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){

@@ -494,6 +508,9 @@
                            StationId: __data.StationId

                        };

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

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

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

                        }					
                        optsList.push(tmp);

                    }

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

@@ -502,6 +519,7 @@
                    $("#station_name3").text('').html('<option>暂无可测机房站点</option>');

                    

                }

                isNewLoad = false;

                layer.close(filterLoad);

                searchstationstate(true); 

            });