星伟
2018-09-27 987e9dda7748539ae08f4efc153042cc329688e0
Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
4个文件已修改
803 ■■■■ 已修改文件
gx_tieta/WebRoot/eleHistoryWarn.jsp 258 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/elewarn.jsp 254 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/equip-charge-param.jsp 147 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/equipment.jsp 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -40,7 +40,8 @@
                        <table>
                            <tbody>
                                <tr>
                                    <th><s:text name="Maintenance_area"/></th>                                                        <!-- 维护区 -->
                                    <th>省</th>                                                        <!-- 省 -->
                                    <th>市</th>                                                        <!-- 市 -->
                                    <th><s:text name="Computer_site"/></th>                                                            <!-- 机房站点 -->
                                    <th><s:text name="Battery"/></th>                                                                <!-- 蓄电池组 -->
                                    <th colspan="2" style="width: 30%;"><s:text name="Alarm"/><s:text name="Start_date"/></th>        <!-- 开始告警日期 -->
@@ -48,6 +49,11 @@
                                <tr>
                                    <td>
                                        <select name="" id="station_name1">
                                        </select>
                                    </td>
                                    <td>
                                        <select name="" id="city">
                                            
                                        </select>
                                    </td>
@@ -386,7 +392,8 @@
            var temp={
                page:Page,
                binf:{
                    StationName1:$('#station_name1').val(),                                                    //维护区
                    StationName1:$('#station_name1').val(),                                                    // 省
                    StationName2:$('#city').val(),                                                            // 市
                    StationName:$('#station_name').val(),                                                    //机房名称
                    BattGroupId:$('#battgroup_name').val(),                                                    //电池组名称
                },
@@ -418,6 +425,7 @@
            return temp;
        }
        
        // 省-市-机房-电池组
        $(document).ready(function(){
            //页面加载时查询维护区中的枢纽类型
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -441,201 +449,139 @@
                }else{
                    $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
                }
                findStationNamebyStationname1();
                findCity();
            });
        });
        
        //当维护区的值变换时更新机房站点
        // 根据维护区的内容查询市
        function findCity() {
            var data = {
                StationName1: $("#station_name1").val()
            };
            // 请求获取当前省下的市
            $.ajax({
                type: "post",
                url: "BattInfAction!serchStationName2",
                async:true,
                dataType:'json',
                data:"json = "+JSON.stringify(data),
                success: function(data){
                    var rs = JSON.parse(data.result);
                    var $select = $("#city");
                    if(rs.code == 1) {
                        var _data= rs.data;
                        // 根据数据构造生成下拉列表的数据
                        var optsList = [];
                        for(var i=0;i<_data.length;i++){
                            var __data = _data[i];
                            var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                            optsList.push(tmp);
                        }
                        // 根据数据生成下拉列表
                        createOptions($select, optsList, true);
                    }else {
                        $select.text('').html('<option>暂无可测市</option>');
                    }
                    findStationNamebyStationname1();
                }
            });
        }
        //当维护区的值变换时更新市
        $('#station_name1').change(function(){
            findCity();
        });
        //当维护区的值变换时更新机房站点
        $('#city').change(function(){
            findStationNamebyStationname1();
        });
        
        var isNewload = true;
        //根据维护区查询站点
        //根据省,市查询站点
        function findStationNamebyStationname1(){
            var user = {
                UNote:$("#station_name1 option:selected").val()
            var tmp = {
                StationName1:$("#station_name1").val(),
                StationName2:$("#city").val()
            };
            var stationid = getQueryString("stationId");
            //var selectvalue=$("#station_name1 option:selected").val();
            //alert(selectvalue);
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
                //console.info(data);
                data=data.result;
                data=eval("("+data+")");
                if(data.code==1 && data.data.length>0){
            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
                var rs = JSON.parse(data.result);
                if(rs.code==1){
                    var _data = rs.data;
                    var $select = $("#station_name");
                    $select.text('');
                    for(var i=0;i<=data.data.length;i++){
                        var $option=$("<option></option>");
                        if(i==0){
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                            $option.attr("value", "");
                        }else{
                            $option.text(data.data[i-1]);
                            $option.attr("value",data.data[i-1]);
                            if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
                                $option.attr("selected",true);
                                isNewload = false;
                            }
                        }
                        $select.append($option);
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                        var _attr = {
                            StationId: __data.StationId
                        };
                        var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else{
                    $("#station_name").text('').html('<option>暂无管理的机房站点</option>');
                    $("#station_name").text('').html('<option>暂无可测机房站点</option>');
                }
                findserchByBattGroupNamebystationname();
            });
        }
        
        // 根据机房名称查询电池组
        $('#station_name').change(function(){
            findserchByBattGroupNamebystationname();
        });
        
        //根据维护区和机房查询蓄电池组
        //根据省,市和机房查询蓄电池组
        function findserchByBattGroupNamebystationname(){
            var user = {
                UNote:$("#station_name1 option:selected").val(),
                UName:$("#station_name option:selected").val()
            var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
            // 构造查询条件
            var tmp = {
                StationName1:$("#station_name1").val(),
                StationName2:$("#city").val(),
                StationName3: $("#station_name").val(),
                StationId: stationid
            };
        
            //var station_name1=$("#station_name1 option:selected").val();
            //var station_name=$("#station_name option:selected").val();
            
            $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
            $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
                data=data.result;
                //console.info(data);
                data=eval("("+data+")");
                //console.info(data);        
                if(data.code==1 && data.data.length>0){
                    var $select = $("#battgroup_name");
                    $select.text('');
                    for(var i=0;i<=data.data.length;i++){
                        $option=$("<option></option>");
                        if(i!=0){
                            $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
                            $option.attr("value",data.data[i-1].BattGroupId);
                            $option.attr("stationname",data.data[i-1].StationName);
                        }else{
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                            $option.attr("value", "0");
                        }
                        $select.append($option);
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<data.data.length;i++){
                        var _data = data.data[i];
                        var _attr = {
                            stationname: _data.StationName,
                            dev_id: _data.FBSDeviceId,
                            batt_num: _data.GroupIndexInFBSDevice+1
                        };
                        var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
                        var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
                        optsList.push(tmp);
                    }
                    searchHistalm();            //加载完电池组就查询告警
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                    $select.find('option').eq(0).val(0);
                    searchHistalm();    // 查询历史告警
                }else{
                    $("#battgroup_name").text('').html('<option>暂无管理的蓄电池组</option>');
                    $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
                }
            });
        }
        
        /* $(function(){
            //页面加载时查询维护区中的枢纽类型
            $.post("BattInfAction_serchByStation",null,function(data) {
                data = data.result;
                data = eval("(" + data + ")");
                //console.info(data);
                if (data.code == 1 && data.data.length > 0) {
                    var $select = $("#station_name1");
                    $select.text('');
                    for ( var i = 0; i <= data.data.length; i++) {
                        var $option = $("<option></option>");
                        if (i == 0) {
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+ data.sum+ "<s:text name='Species'/>)");
                            $option.val("");
                        } else {
                            $option.text(data.data[i - 1].StationName1);
                            $option.val(data.data[i - 1].StationName1);
                        }
                        $select.append($option);
                    }
                }
                findStationNamebyStationname1();
            });
            //当维护区的值变换时更新机房站点
            $('#station_name1').change(function() {
                findStationNamebyStationname1();
            });
        });
        //根据维护区查询站点
        function findStationNamebyStationname1() {
            var stationid = getQueryString("stationId");
            var selectvalue = $("#station_name1 option:selected").val();
            //alert(selectvalue);
            $.post("BattInfAction_serchByStationName", "bif.StationName1="+ selectvalue, function(data) {
                //console.info(data);
                data = data.result;
                data = eval("(" + data + ")");
                if (data.code == 1 && data.data.length > 0) {
                    var $select = $("#station_name");
                    $select.text('');
                    for ( var i = 0; i <= data.data.length; i++) {
                        $option = $("<option></option>");
                        if (i == 0) {
                            $option.text("<s:text name='All'/>(<s:text name='Common'/>" + data.sum + "<s:text name='Species'/>)");
                            $option.attr("value", "");
                        } else {
                            $option.text( data.data[i-1].StationName);
                            $option.attr("value",data.data[i-1].StationName);
                            if(stationid != undefined && stationid == data.data[i-1].StationId){
                                $option.attr("selected",true);
                            }
                        }
                        $select.append($option);
                    }
                }
                findserchByBattGroupNamebystationname();
            });
        }
        $('#station_name').change(function() {
            findserchByBattGroupNamebystationname();
        });
        //根据维护区和机房查询蓄电池组
        function findserchByBattGroupNamebystationname() {
            var station_name1 = $("#station_name1 option:selected").val();
            var station_name = $("#station_name option:selected").val();
            if(station_name.length == 0){
                var $select = $("#battgroup_name");
                $select.text('');
                var $option = $("<option></option>");
                $option.html("<s:text name='All'/>");
                $option.attr("value", "0");
                $select.append($option);
                searchHistalm();
            }else{
                $.post("BattInfAction_serchByBattGroupName","bif.StationName1=" + station_name1    + "&bif.StationName=" + station_name,function(data) {
                    data = data.result;
                    //console.info(data);
                    data = eval("(" + data + ")");
                    //console.info(data.data);
                    if (data.code == 1 && data.data.length > 0) {
                        var $select = $("#battgroup_name");
                        $select.text('');
                        for ( var i = 0; i <= data.data.length; i++) {
                            $option = $("<option></option>");
                            if (i != 0) {
                                $option.text(data.data[i - 1].BattGroupName+ "-"+ data.data[i - 1].MonCount+ "<s:text name='Section'/>");
                                $option.attr("value",data.data[i - 1].BattGroupId);
                            } else {
                                //option.innerHTML = "全部蓄电池组(共"    + data.sum + "组)";
                                $option.html("<s:text name='All'/>(<s:text name='Common'/>"    + data.sum + "<s:text name='Species'/>)");
                                $option.attr("value", "0");
                            }
                            $select.append($option);
                        }
                        searchHistalm();
                    }
                });
            }
        } */
        // 更新电池组名称查询历史告警
        $('#battgroup_name').on("change",function(){
            searchHistalm();
        });
gx_tieta/WebRoot/elewarn.jsp
@@ -35,13 +35,19 @@
                <!-- 维护区信息 -->
                <table>
                    <tr class="fWeight">
                        <td><s:text name="Maintenance_area"/></td>        <!-- 维护区 -->
                        <td>省</td>        <!-- 省 -->
                        <td>市</td>        <!-- 市 -->
                        <td><s:text name="Computer_site"/></td>            <!-- 机房站点(或机房设备) -->        
                        <td><s:text name="Battery"/></td>                <!-- 蓄电池组 -->
                    </tr>
                    <tr>
                        <td>
                            <select  id="station_name1" name="bmd.binf.StationName1">
                            </select>
                        </td>
                        <td>
                            <select  id="city" name="bmd.binf.StationName2">
                                
                            </select>
                        </td>
@@ -342,7 +348,7 @@
        $.post("Battalarm_dataAction!serchByCondition",$('#search_form').serialize(),function(data){
            data=data.result;
            data=eval("("+data+")");
            console.info(data);
            //console.info(data);
            var pagecurr=parseInt($('#pageCurr').attr('value'));
            var pagesize=parseInt($('#pageSize').attr('value'));                    
            if(data.code==1 && data.data.length>0){
@@ -551,6 +557,7 @@
        eleform.submit();
    }
    
    // 省-市-机房-电池组
    $(document).ready(function(){
        //页面加载时查询维护区中的枢纽类型
        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -574,200 +581,137 @@
            }else{
                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
            }
            findStationNamebyStationname1();
            findCity();
        });
    });
    
    //当维护区的值变换时更新机房站点
    // 根据维护区的内容查询市
    function findCity() {
        var data = {
            StationName1: $("#station_name1").val()
        };
        // 请求获取当前省下的市
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName2",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
                var rs = JSON.parse(data.result);
                var $select = $("#city");
                if(rs.code == 1) {
                    var _data= rs.data;
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else {
                    $select.text('').html('<option>暂无可测市</option>');
                }
                findStationNamebyStationname1();
            }
        });
    }
    //当维护区的值变换时更新市
    $('#station_name1').change(function(){
        findCity();
    });
    //当维护区的值变换时更新机房站点
    $('#city').change(function(){
        findStationNamebyStationname1();
    });
    
    var isNewload = true;
    //根据维护区查询站点
    //根据省,市查询站点
    function findStationNamebyStationname1(){
        var user = {
            UNote:$("#station_name1 option:selected").val()
        var tmp = {
            StationName1:$("#station_name1").val(),
            StationName2:$("#city").val()
        };
        var stationid = getQueryString("stationId");
        //var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
        $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
            //console.info(data);
            data=data.result;
            data=eval("("+data+")");
            if(data.code==1 && data.data.length>0){
        $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
            var rs = JSON.parse(data.result);
            if(rs.code==1){
                var _data = rs.data;
                var $select = $("#station_name");
                $select.text('');
                for(var i=0;i<=data.data.length;i++){
                    var $option=$("<option></option>");
                    if(i==0){
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                        $option.attr("value", "");
                    }else{
                        $option.text(data.data[i-1]);
                        $option.attr("value",data.data[i-1]);
                        if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
                            $option.attr("selected",true);
                            isNewload = false;
                        }
                    }
                    $select.append($option);
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for(var i=0;i<_data.length;i++){
                    var __data = _data[i];
                    var _attr = {
                        StationId: __data.StationId
                    };
                    var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList, true);
            }else{
                $("#station_name").text('').html('<option>暂无管理的机房站点</option>');
                $("#station_name").text('').html('<option>暂无可测机房站点</option>');
            }
            findserchByBattGroupNamebystationname();
        });
    }
    
    // 根据机房名称查询电池组
    $('#station_name').change(function(){
        findserchByBattGroupNamebystationname();
    });
    
    //根据维护区和机房查询蓄电池组
    //根据省,市和机房查询蓄电池组
    function findserchByBattGroupNamebystationname(){
        var user = {
            UNote:$("#station_name1 option:selected").val(),
            UName:$("#station_name option:selected").val()
        var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
        // 构造查询条件
        var tmp = {
            StationName1:$("#station_name1").val(),
            StationName2:$("#city").val(),
            StationName3: $("#station_name").val(),
            StationId: stationid
        };
    
        //var station_name1=$("#station_name1 option:selected").val();
        //var station_name=$("#station_name option:selected").val();
        
        $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
        $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
            data=data.result;
            //console.info(data);
            data=eval("("+data+")");
            //console.info(data);        
            if(data.code==1 && data.data.length>0){
                var $select = $("#battgroup_name");
                $select.text('');
                for(var i=0;i<=data.data.length;i++){
                    $option=$("<option></option>");
                    if(i!=0){
                        $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
                        $option.attr("value",data.data[i-1].BattGroupId);
                        $option.attr("stationname",data.data[i-1].StationName);
                    }else{
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                        $option.attr("value", "0");
                    }
                    $select.append($option);
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for(var i=0;i<data.data.length;i++){
                    var _data = data.data[i];
                    var _attr = {
                        stationname: _data.StationName,
                        dev_id: _data.FBSDeviceId,
                        batt_num: _data.GroupIndexInFBSDevice+1
                    };
                    var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
                    var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList, true);
                $select.find('option').eq(0).val(0);
                searchAlarm();            //加载完电池组就查询告警
            }else{
                $("#battgroup_name").text('').html('<option>暂无管理的蓄电池组</option>');
                $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
            }
        });
    }
    /* //页面加载时查询维护区中的枢纽类型
    $.post("BattInfAction_serchByStation",null,function(data){
        data=data.result;
        data=eval("("+data+")");
        //console.info(data);
        if(data.code==1 && data.data.length>0){
            var $seleect=$("#station_name1");
             $seleect.text('');
            for(var i=0;i<=data.data.length;i++){
                $option=$("<option></option>");
                if(i==0){
                    $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                    $option.attr("value", "");
                }else{
                    $option.text(data.data[i-1].StationName1);
                    $option.attr("value",data.data[i-1].StationName1);
                }
                 $seleect.append($option);
            }
        }
        findStationNamebyStationname1();
    });
    //当维护区的值变换时更新机房站点
    $('#station_name1').change(function(){
        findStationNamebyStationname1();
    });
    //根据维护区查询站点
    function findStationNamebyStationname1(){
        var stationid = getQueryString("stationId");
        var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
        $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
            //console.info(data);
            data=data.result;
            data=eval("("+data+")");
            //console.info(stationid);
            //console.info(data);
            if(data.code==1 && data.data.length>0){
                var $select = $("#station_name");
                $select.text('');
                for(var i=0;i<=data.data.length;i++){
                    $option=$("<option></option>");
                    if(i==0){
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                        $option.attr("value", "");
                    }else{
                        $option.text(data.data[i-1].StationName);
                        $option.attr("value",data.data[i-1].StationName);
                        if(stationid!=undefined && stationid == data.data[i-1].StationId){
                            $option.attr("selected",true);
                        }
                    }
                    $select.append($option);
                }
            }
            findserchByBattGroupNamebystationname();
        });
    }
    $('#station_name').change(function(){
        findserchByBattGroupNamebystationname();
    });
    //根据维护区和机房查询蓄电池组
    function findserchByBattGroupNamebystationname(){
        var station_name1=$("#station_name1 option:selected").val();
        var station_name=$("#station_name option:selected").val();
        if(station_name.length == 0){
            var $select = $("#battgroup_name");
            $select.text('');
            var $option=$("<option></option>");
            $option.html("<s:text name='All'/>");
            $option.attr("value", "0");
            $select .append($option);
            searchAlarm();            //加载完电池组就查询告警
        }else{
            $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
                data=data.result;
                //console.info(data);
                data=eval("("+data+")");
                //console.info(data.data);
                if(data.code==1 && data.data.length>0){
                    var $select = $("#battgroup_name");
                    $select.text('');
                    for(var i=0;i<=data.data.length;i++){
                        $option=$("<option></option>");
                        if(i!=0){
                            $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"节");
                            $option.attr("value",data.data[i-1].BattGroupId);
                        }else{
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                            $option.attr("value", "0");
                        }
                        $select .append($option);
                    }
                    searchAlarm();            //加载完电池组就查询告警
                }
            });
        }
    }
    */
    
    //页面中表格的点击事件
    $(document).ready(function(){
gx_tieta/WebRoot/equip-charge-param.jsp
@@ -42,7 +42,8 @@
                <table>
                    <thead>
                        <tr>
                            <th><s:text name="Maintenance_area"/><!-- 维护区 --></th>
                            <th>省<!-- 省 --></th>
                            <th>市<!-- 市 --></th>
                            <th><s:text name="Computer_site"/><!-- 机房站点 --></th>
                        </tr>
                    </thead>
@@ -50,6 +51,10 @@
                        <tr>
                            <td>
                                <select id="station_name1" name="station_name1">
                                </select>
                            </td>
                            <td>
                                <select id="city" name="station_name2">
                                </select>
                            </td>                            
                            <td>
@@ -305,7 +310,6 @@
                success: function(data){ 
                    data = eval('('+data+')');
                    var model = eval('('+data.result+')');
                    console.info(model);
                    if(model.code == 1){
                        var arr = new Array();
                        for(var i = 0;i<model.data.length;i++){
@@ -349,72 +353,111 @@
            }); 
        }
        
        // 省-市-机房-电池组
        $(document).ready(function(){
            //页面加载时查询维护区中的枢纽类型
            $.post("BattInfAction!serchByStationNot91",null,function(data){
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
                data=data.result;
                data=eval("("+data+")");
                //console.info(data);
                var $select=$("#station_name1");
                $select.text("");
                if(data.code==1 && data.data.length>0){
                    var $select = $("#station_name1");
                    $select.text('');
                    for(var i=0;i<=data.data.length;i++){
                        $option=$("<option></option>");
                        if(i==0){
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                            $option.attr("value", "");            
                        }else{
                            $option.text(data.data[i-1].StationName1);
                            $option.attr("value",data.data[i-1].StationName1);
                            $option.text(data.data[i-1]);
                            $option.attr("value",data.data[i-1]);
                        }                    
                        $select.append($option);
                    }
                }else{
                    var $option=$("<option>暂无9100S维护区</option>");
                    $select.append($option);
                }
                findStationNamebyStationname1();
            });
            //当维护区的值变换时更新机房站点
            $('#station_name1').change(function(){
                findStationNamebyStationname1();
            });
            //根据维护区查询站点
            function findStationNamebyStationname1(){
                //var stationid = getQueryString("stationId");
                var selectvalue=$("#station_name1 option:selected").val();
                //alert(selectvalue);
                $.post("BattInfAction!serchByStationNameNot91","bif.StationName1="+selectvalue,function(data){
                    //console.info(data);
                    data=data.result;
                    data=eval("("+data+")");
                    console.info(data);
                    if(data.code==1 && data.data.length>0){
                        var $select = $("#station_name");
                        $select.text("");
                        for(var i=0;i<=data.data.length;i++){
                            $option=$("<option></option>");
                            if(i==0){
                                $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                                $option.attr("value", "");
                            }else{
                                $option.text(data.data[i-1].StationName);
                                $option.attr("value",data.data[i-1].FBSDeviceId);
                                $option.attr("dev_name",data.data[i-1].FBSDeviceName);
                                $option.attr("stataion_name",data.data[i-1].StationName);
                                $option.attr("stataion_name1",data.data[i-1].StationName1);
                                $select.append($option);
                            }
                        }
                    }
                });
            }
                }else{
                    $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
                }
                findCity();
            });
        });
        
        // 根据维护区的内容查询市
        function findCity() {
            var data = {
                StationName1: $("#station_name1").val()
            };
            // 请求获取当前省下的市
            $.ajax({
                type: "post",
                url: "BattInfAction!serchStationName2",
                async:true,
                dataType:'json',
                data:"json = "+JSON.stringify(data),
                success: function(data){
                    var rs = JSON.parse(data.result);
                    var $select = $("#city");
                    if(rs.code == 1) {
                        var _data= rs.data;
                        // 根据数据构造生成下拉列表的数据
                        var optsList = [];
                        for(var i=0;i<_data.length;i++){
                            var __data = _data[i];
                            var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                            optsList.push(tmp);
                        }
                        // 根据数据生成下拉列表
                        createOptions($select, optsList, true);
                    }else {
                        $select.text('').html('<option>暂无可测市</option>');
                    }
                    findStationNamebyStationname1();
                }
            });
        }
        //当维护区的值变换时更新市
        $('#station_name1').change(function(){
            findCity();
        });
        //当维护区的值变换时更新机房站点
        $('#city').change(function(){
            findStationNamebyStationname1();
        });
        //根据省,市查询站点
        function findStationNamebyStationname1(){
            var tmp = {
                StationName1:$("#station_name1").val(),
                StationName2:$("#city").val()
            };
            //var selectvalue=$("#station_name1 option:selected").val();
            //alert(selectvalue);
            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
                var rs = JSON.parse(data.result);
                if(rs.code==1){
                    var _data = rs.data;
                    var $select = $("#station_name");
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                        var _attr = {
                            'stataion_name1': __data.StationName1,
                            'stataion_name': __data.StationName3,
                            'dev_name': __data.FBSDeviceName
                        };
                        var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList);
                }else{
                    $("#station_name").text('').html('<option>暂无可测机房站点</option>');
                }
            });
        }
        
        //首页
        $('#home').click(function(){
gx_tieta/WebRoot/equipment.jsp
@@ -66,7 +66,8 @@
                <input type="hidden" value="10" name="bup.page.pageSize" id="pageSize" />
                <table>
                    <tr class="fWeight">    
                        <td><s:text name="Maintenance_area"/></td>                        <!-- 维护区 -->
                        <td>省</td>                        <!-- 省 -->
                        <td>市</td>                        <!-- 市 -->
                        <td><s:text name="Computer_site"/></td>                            <!-- 机房站点(或机房设备) -->
                        <td><s:text name ="Statistical"/><s:text name ="Parameter"/></td>    <!-- 统计参数 -->
                        
@@ -77,6 +78,10 @@
                    <tr>
                        <td>
                            <select id="station_name1">
                            </select>
                        </td>
                        <td>
                            <select id="city">
                            </select>
                        </td>
                        <td>
@@ -833,77 +838,116 @@
            }                
        });
    }
    // 省-市-机房-电池组
    $(document).ready(function(){
        //页面加载时查询维护区中的枢纽类型
        $.post("BattInfAction_serchByStation",null,function(data){
        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
            data=data.result;
            data=eval("("+data+")");
            //console.info(data);
            if(data.code==1 && data.data.length>0){
                var $select=$("#station_name1");
                $select.text("");
                var $select = $("#station_name1");
                $select.text('');
                for(var i=0;i<=data.data.length;i++){
                    $option=$("<option></option>");
                    if(i==0){
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
                        $option.attr("value", "");            
                    }else{
                        $option.text(data.data[i-1].StationName1);
                        $option.attr("value",data.data[i-1].StationName1);
                        $option.text(data.data[i-1]);
                        $option.attr("value",data.data[i-1]);
                    }                    
                    $select.append($option);
                }
            }
            findStationNamebyStationname1();
            var $yearselect = $('#search-year');
            var d = new Date();
            //console.info(d.getFullYear());
            for(var i=1970;i<= d.getFullYear();i++){
                var $option = $("<option></option>");
                $option.attr("value",i);
                $option.text(i);
                if(i == d.getFullYear()){
                    $option.attr("selected", true);
                }
                $yearselect.append($option);
            }else{
                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
            }
            findCity();
        });
        //当维护区的值变换时更新机房站点
        $('#station_name1').change(function(){
            findStationNamebyStationname1();
        });
        //根据维护区查询站点
        function findStationNamebyStationname1(){
            var selectvalue=$("#station_name1 option:selected").val();
            //alert(selectvalue);
            $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
                //console.info(data);
                data=data.result;
                data=eval("("+data+")");
                //console.info(data);
                if(data.code==1 && data.data.length>0){
                    var $select = $("#station_name");
                    $select.text("");
                    for(var i=0;i<data.data.length;i++){
                        $option=$("<option></option>");
                        $option.text(data.data[i].StationName);
                        $option.attr("value",data.data[i].StationId);
                        $select.append($option);
                    }
                }
            });
        }
    });
    
    // 根据维护区的内容查询市
    function findCity() {
        var data = {
            StationName1: $("#station_name1").val()
        };
        // 请求获取当前省下的市
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName2",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
                var rs = JSON.parse(data.result);
                var $select = $("#city");
                if(rs.code == 1) {
                    var _data= rs.data;
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for(var i=0;i<_data.length;i++){
                        var __data = _data[i];
                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                }else {
                    $select.text('').html('<option>暂无可测市</option>');
                }
                findStationNamebyStationname1();
            }
        });
    }
    //当维护区的值变换时更新市
    $('#station_name1').change(function(){
        findCity();
    });
    //当维护区的值变换时更新机房站点
    $('#city').change(function(){
        findStationNamebyStationname1();
    });
    //根据省,市查询站点
    function findStationNamebyStationname1(){
        var tmp = {
            StationName1:$("#station_name1").val(),
            StationName2:$("#city").val()
        };
        //var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
        $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
            var rs = JSON.parse(data.result);
            if(rs.code==1){
                var _data = rs.data;
                var $select = $("#station_name");
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for(var i=0;i<_data.length;i++){
                    var __data = _data[i];
                    var _attr = {
                        StationId: __data.StationId
                    };
                    var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList);
            }else{
                $("#station_name").text('').html('<option>暂无可测机房站点</option>');
            }
        });
    }
    // 查询信息
    function createSearchParam(){
        var temp = {
            StationId:$('#station_name').val(),
            StationName1:$('#station_name1').val(),
            StationName2:$('#city').val(),
            BattProductDate:$('#startime').val()+" 00:00:00",
            BattProductDate1:$('#endtime').val()+" 23:59:59",
            MonCount:Page.pageCurr,