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

didiyu

2018-09-28 97db75238a96a75f41bafd469548c2a84ba37080

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

 gx_tieta/WebRoot/batt-attention.jsp

@@ -417,7 +417,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

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

                        optsList.push(tmp);

                    }

                    

@@ -441,7 +441,7 @@
            var tmp = {

                StationName1:$("#station_name1").val(),

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

                StationName3: $("#station_name").val(),

                StationName: $("#station_name").val(),

                StationId: stationid

            };

        


 gx_tieta/WebRoot/control.jsp

@@ -3976,11 +3976,10 @@
            // 机房->电池组

            treeView.ele.on('click', '.home', function() {

                var home = $(this).data('attr');

                console.log(home);

                var tmp = {

                    StationName1: home.StationName1,

                    StationName2: home.StationName2,

                    StationName3: home.StationName3,

                    StationName: home.StationName,

                    StationId: home.StationId

                };

                fourth(treeView, $(this).parent(), tmp);

@@ -3994,7 +3993,7 @@
                    BattGroupId = eleGroup.BattGroupId;

                    // 对BTS9611做特殊的处理

                    var batt = getBatt();

                    console.info(batt);

                    //console.info(batt);

                    $('#eleCircleBtn').removeClass('hide');

                    if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {

                        var isAct = $('#eleCircleBtn').hasClass('action');


 gx_tieta/WebRoot/dataManage.jsp

@@ -688,7 +688,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -712,7 +712,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    

@@ -742,6 +742,7 @@
                

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

                createOptions($select, optsList, true);

                $select.find('option:selected').eq(0).val(0);

            }else{

                $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

            }


 gx_tieta/WebRoot/dischargeplan.jsp

@@ -40,7 +40,8 @@
                <!-- 维护区信息 -->

                <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>            <!-- 蓄电池组 -->

                        <td><s:text name="Test"/><s:text name="Status"/></td>        <!-- 测试状态 -->

@@ -49,9 +50,10 @@
                    </tr>

                    <tr>

                        <td>

                            <select id="station_name1" name="station_name1">

								
                            </select>

                            <select id="station_name1" name="station_name1"></select>

                        </td>

                        <td>

                            <select id="city" name="station_name2"></select>

                        </td>

                        <td>

                            <select id="station_name" name="station_name">

@@ -616,6 +618,7 @@
        $('#start-discharge-end-date').val(new Date().format('yyyy-MM-dd'));

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

        

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

        $(document).ready(function(){

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

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

@@ -639,196 +642,134 @@
                }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);

                            }	
                        }					
                        $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.StationName, __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(),

                StationName: $("#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);

                    }

                    var dischargestate = (parseInt(getQueryString("discharge-state")));

                    if(dischargestate >= 0 && isNewload){

                        $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');

                        isNewload = false;

                    }

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

                    createOptions($select, optsList, true);

                    $select.find('option').eq(0).val(0);

                    searchDischarge();

                }else{

                    $("#battgroup_name").text('').html('<option>暂无管理的蓄电池组</option>');

                    $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

                }

            });

        }

		
        /* $(document).ready(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++){

                        $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);	
                        }					
                        $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.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
                            //    $option.attr("value", "");			
                            //}else{

                                $option.text(data.data[i].StationName);

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

                                if(stationid!=undefined && stationid == data.data[i].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();

			
            $.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.html("<s:text name='All'/>（<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>）");

                            $option.attr("value", "0");

                        }

                        $select.append($option);

                    }

                    var dischargestate = (parseInt(getQueryString("discharge-state")));

                    if(dischargestate >= 0){

                        $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');

                        searchDischarge();

                    }

                }

            });

        } */

		
				
        $('#export_table').click(function(){

            //console.info($('#tbHead .tbFixed thead th').length);

            exprotTable($('#tbHead table thead th'),$('#tbHead table tbody td'),$('#export_excel'),$('#table_th_arr'),$('#table_td_arr'));

@@ -848,8 +789,7 @@
            }

            eleTh_Text.attr('value',ArrTh);

            eleTd_Text.attr('value',ArrTd);

            //console.info(ArrTh);

            //console.info(ArrTd);

			
            eleform.submit();

        }

    

@@ -857,6 +797,7 @@
            var temp = {

                binf:{

                    StationName:$('#station_name').val(),

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

                    StationName1:$('#station_name1').val(),

                    BattGroupId:$('#battgroup_name').val(),

                },


 gx_tieta/WebRoot/dischargetest.jsp

@@ -1217,7 +1217,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

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

                        optsList.push(tmp);

                    }

                    

@@ -1241,7 +1241,7 @@
            var tmp = {

                StationName1:$("#station_name1").val(),

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

                StationName3: $("#station_name").val(),

                StationName: $("#station_name").val(),

                StationId: stationid

            };

        


 gx_tieta/WebRoot/ele-param.jsp

@@ -672,7 +672,7 @@
                            var _attr = {

                                StationId: __data.StationId

                            };

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

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

                            optsList.push(tmp);

                        }

                        


 gx_tieta/WebRoot/eleAnalyse.jsp

@@ -396,7 +396,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -421,7 +421,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/WebRoot/eleAssess.jsp

@@ -657,7 +657,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -682,7 +682,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/WebRoot/eleHistoryWarn.jsp

@@ -517,7 +517,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

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

                        optsList.push(tmp);

                    }

                    

@@ -542,7 +542,7 @@
            var tmp = {

                StationName1:$("#station_name1").val(),

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

                StationName3: $("#station_name").val(),

                StationName: $("#station_name").val(),

                StationId: stationid

            };

        


 gx_tieta/WebRoot/eleMonomer.jsp

@@ -712,7 +712,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -737,7 +737,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/WebRoot/eleWarnPrmSet.jsp

@@ -34,12 +34,22 @@
                <table>

                    <thead>

                        <tr>

                            <th>省</th>                                <!-- 省 -->

                            <th>市</th>                                <!-- 市 -->

                            <th><s:text name="Equipment"/></th>        <!-- 设备 -->

                            <th><s:text name="Alarm_name"/></th>  <!-- 告警名称 -->

                        </tr>

                    </thead>

                    <tbody>

                        <tr>

                            <td>

                                <select id="station_name1">                <!-- 省 -->

                                </select>

                            </td>

                            <td>

                                <select id="city">                <!-- 市 -->

                                </select>

                            </td>

                            <td>

                                <select id="equipment-name">

                                    <option value="">全部</option>        <!-- 设备 -->

@@ -323,86 +333,133 @@
            

        $('#serchid').click(function(){

            searchEquipmentName();

        });	
			
				
        /* $.post("Dev_paramAction!serchAllDevId",null,function(data){

            //console.info("sfewf");

            data=data.result;

            data=eval("("+data+")");

            console.info(data);

            if(data.code==1 && data.data.length>0){

				
                var $select = $("#equipment-name");

                 $select.text('');

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

                    $option=$("<option></option>");

                    $option.html(data.data[i].note);

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

                    $select.append($option);

                }

				
                //console.info("sfwfaf");

                //console.info(arr);

                //$select.append(arr);

            }

            findWarmName();

        }); */

        });

        

		
        findStationNamebyStationname1();

        var isNewload = true;

        //根据维护区查询站点

        function findStationNamebyStationname1(){

            var user = {

                UNote:""

            };

            var stationid = getQueryString("stationId");

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

            //alert(selectvalue);

            $.post("User_battgroup_baojigroup_battgroupAction!serchStationByStationName1","json="+JSON.stringify(user),function(data){

                console.info(data);

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

        $(document).ready(function(){

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

            $.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 = $("#equipment-name");

                    var $select = $("#station_name1");

                    $select.text('');

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

                        var $option=$("<option></option>");						
                        $option.text(data.data[i].StationName);

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

                        if(stationid!=undefined && stationid == data.data[i].StationId && isNewload){

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

                            isNewload = false;

                        }	
							
                    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.data.length+"<s:text name='Species'/>)");	
                            $option.attr("value", "");			
                        }else{

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

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

                    }

                }else{

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

                    $("#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();

        });

		
        // 根据机房名称查询电池组

        $('#equipment-name').change(function(){

            findWarmName();

        });

		
        //根据省，市查询站点

        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 = $("#equipment-name");

                    // 根据数据构造生成下拉列表的数据

                    var optsList = [];

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

                        var __data = _data[i];

                        var _attr = {

                            StationId: __data.StationId,

                            StationName: __data.StationName

                        };

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

                        optsList.push(tmp);

                    }

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

                    createOptions($select, optsList);

                }else{

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

                }

                findWarmName();

            });

        }

        

		
        // 获取告警参数

        function findWarmName(){        

            var dev_id = $("#equipment-name option:selected").val();

            //console.info(dev_id);

            var warmId ={ "dev_id":dev_id

            var warmId ={ 
                "dev_id":dev_id

            };

            //console.info(warmId);

            //console.info("aa");

            $.post("Dev_paramAction!serchByInfo","json="+JSON.stringify(warmId),function(data){

                data=data.result;

                data=eval("("+data+")");

                console.info(data);	
                //console.info(data);	
                if(data.code==1 && data.data.length>0){                

                    var $select = $("#alarm-name");

                    $select.text('');

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

                    //console.info(data.data[i]);

                    //console.info(getParmName(data.data[i]));

                    $option =$("<option></option>");

                        if(i==0){

                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");    

@@ -413,11 +470,9 @@
                            

                        }

                        $select.append($option);

                        //console.info($option);	
                    }

                    //console.info("123");

                    //console.info($("#equipment-name option:selected").val());

				   
					
                    searchEquipmentName();

                }

            });

        }

@@ -430,20 +485,23 @@
            all_almlist = new Array();

            var dev_id = $("#equipment-name option:selected").val();

            var alm_id = $("#alarm-name option:selected").val();

            //console.info(dev_id);

            //console.info("1234");

            var warmId ={ "dev_id":dev_id,

                          "alm_id":alm_id

            var warmId ={

                stationName1:$("#station_name1").val(),

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

                stationName: $("#equipment-name").find('option:selected').attr('stationname'), 
                "dev_id":dev_id,

                "alm_id":alm_id

            };

            //console.log(warmId);

            $.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){

                //console.info(JSON.stringify(warmId));

                var data=data.result;

                var data=eval("("+data+")");

                all_almlist = data.data;        

                //console.info(data);

                if(data.code==1&&data.data.length>0){

                    var arr = new Array();

                    data=data.data;

                    console.info(data);

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

                        arr.push(data[i].note);               //设备

                        arr.push(getParmName(data[i].alm_id));            //告警名称


 gx_tieta/WebRoot/ele_statistics.jsp

@@ -634,7 +634,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -658,7 +658,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/WebRoot/elegroup.jsp

@@ -35,14 +35,18 @@
                <!-- 维护区信息 -->

                <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="">

								
                            </select>

                        </td>

                        <td>

                            <select id="city" name="">

                            </select>

                        </td>

                        <td>

@@ -109,8 +113,10 @@
    <!-- 右键表格菜单 -->

    <div id="tb-right-menu">

        <a href="javascript:;" class="apply"><s:text name="Apply"/></a>                                        <!-- 应用 -->

        <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a>                    <!-- 添加单个电池组 -->

        <a href="javascript:;" class="add-province">添加全省机房</a>                                            <!-- 添加全省机房 -->

        <a href="javascript:;" class="add-city">添加全市机房</a>                                                <!-- 添加全市机房 -->

        <a href="javascript:;" class="add-station"><s:text name="Add_all_Chartere_room_batt_group"/></a>    <!-- 添加整个机房电池组 -->

        <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a>                    <!-- 添加单个电池组 -->

        <!--<a href="javascript:;" class="add-weihuqu"><s:text name="Add_maintenance_area_batt_group"/></a>         添加整个维护区电池组 -->

        <div class="a-con">

            <a href="javascript:;" class="all-pitch"><s:text name="All_selected"/></a>                        <!-- 全部选中 -->

@@ -875,93 +881,160 @@
            });

        }

    }



    $(document).ready(function(){		
	
    // 省-市-机房-电池组

    $(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 Ostation_name1=document.getElementById("station_name1");

                Ostation_name1.innerHTML="";

                var $select = $("#station_name1");

                $select.text('');

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

                    option=createEle("option");

                    $option=$("<option></option>");

                    if(i==0){

                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";        /* 全部    共   种 */

                        option.setAttribute("value", "");			
                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
                        $option.attr("value", "");			
                    }else{

                        option.innerHTML=data.data[i-1].StationName1;

                        option.setAttribute("value",data.data[i-1].StationName1);	
                        $option.text(data.data[i-1]);

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

                    Ostation_name1.appendChild(option);

                }				
                    $select.append($option);

                }

            }else{

                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');

            }

            findStationNamebyStationname1();		
        });

		
        //当维护区的值变换时更新机房站点

        $('#station_name1').change(function(){

            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();

    });

	
    //根据省，市查询站点

    function findStationNamebyStationname1(){

        var selectvalue=$("#station_name1 option:selected").val();		
        $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){

            data=data.result;

            data=eval("("+data+")");

            if(data.code==1 && data.data.length>0){

                var Ostttion_name = document.getElementById("station_name");

                Ostttion_name.innerHTML="";

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

                    option=createEle("option");

                    if(i==0){

                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";		
                        option.setAttribute("value", "");			
                    }else{

                        option.innerHTML=data.data[i-1].StationName;

                        option.setAttribute("value",data.data[i-1].StationName);	
                    }					
                    Ostttion_name.appendChild(option);

        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.StationName, __data, _attr);

                    optsList.push(tmp);

                }

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

                createOptions($select, optsList, true);

            }else{

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

            }

            findserchByBattGroupNamebystationname();

        });

        $('#station_name').change(function(){

            findserchByBattGroupNamebystationname();

        });

    }

    

    //根据维护区和机房查询蓄电池组

    // 根据机房名称查询电池组

    $('#station_name').change(function(){

        findserchByBattGroupNamebystationname();

    });

	
    //根据省，市和机房查询蓄电池组

    function findserchByBattGroupNamebystationname(){

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

        var station_name=$("#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(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

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

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

        

        $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){

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

            data=data.result;

            //console.info(data);

            data=eval("("+data+")");

            //console.info(data.data);		
            //console.info(data);		
            if(data.code==1 && data.data.length>0){

				
                var Obattgroup_name = document.getElementById("battgroup_name");

                Obattgroup_name.innerHTML="";

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

                    option=createEle("option");

                    if(i!=0){

                        option.innerHTML=data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>";

                        option.setAttribute("value",data.data[i-1].BattGroupId);

                    }else{

                        option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";

                        option.setAttribute("value", "0");

                    }

                    Obattgroup_name.appendChild(option);

                var $select = $("#battgroup_name");

                // 根据数据构造生成下拉列表的数据

                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);

            }else{

                $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

            }

        });

    }	
    }

    

    //鼠标右键点击

    $('#tbroom').on('mousedown','table tr',function(e){

@@ -1251,15 +1324,100 @@
            

            showAllTd(bigEleGroupTxt,bigEleGroupVal);

        }

		
        // 添加整个省的机房

        $('#tb-right-menu .add-province').click(function() {

            //获取包机房名称和新增电池组名称

            var myRoom=new Array();

            var myRoomVal=new Array();

            var singleELeGroup=new Array();

            var singleEleVal=new Array();

            var province=$('#station_name1').attr('value');	
            if(province.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){

                var binf=new Object();

                binf={

                    BattGroupId: 0,                // 电池组id

                    StationName: '',            // 机房名称

                    StationName2: '',            // 市 
                    StationName1: province,        // 省

                };

                var json=window.JSON.stringify(binf);

                $.post('BattInfAction!serchBatt','result='+json,function(data){

                    var model=eval("("+data.result+")");

                    //console.info(model);

                    if(model.code==1 && model.data.length>0){

                        //var stationid=0;

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

                            var batt=model.data[i];

                            //console.info(batt);

                            myRoom.push(batt.StationName);

                            myRoomVal.push(batt.StationId);								
                            singleELeGroup.push(batt.StationName);

                            singleELeGroup.push(batt.BattGroupName);

                            singleEleVal.push(batt.StationId);

                            singleEleVal.push(batt.BattGroupId);						
                        }

                        //console.info(singleELeGroup);

                        addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);						
                    }

                });

            }else{

                alert('请选择省!');        //请先选择省

            }

        });

		
        // 添加整个市的机房

        $('#tb-right-menu .add-city').click(function() {

            //获取包机房名称和新增电池组名称

            var myRoom=new Array();

            var myRoomVal=new Array();

            var singleELeGroup=new Array();

            var singleEleVal=new Array();

            var city = $('#city').attr('value');	
            if(city.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){

                var binf=new Object();

                binf={

                    BattGroupId: 0,                // 电池组id

                    StationName: '',            // 机房名称

                    StationName2: city,            // 市 
                    StationName1: '',            // 省

                };

                //console.log(binf);

                var json=window.JSON.stringify(binf);

                $.post('BattInfAction!serchBatt','result='+json,function(data){

                    var model=eval("("+data.result+")");

                    console.info(model);

                    if(model.code==1 && model.data.length>0){

                        //var stationid=0;

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

                            var batt=model.data[i];

                            //console.info(batt);

                            myRoom.push(batt.StationName);

                            myRoomVal.push(batt.StationId);								
                            singleELeGroup.push(batt.StationName);

                            singleELeGroup.push(batt.BattGroupName);

                            singleEleVal.push(batt.StationId);

                            singleEleVal.push(batt.BattGroupId);						
                        }

                        //console.info(singleELeGroup);

                        addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);						
                    }

                });

            }else{

                alert('请选择市!');        //请先选择市

            }

        });

		
        //添加单个电池组

        $('#tb-right-menu .add-batt').click(function(){

            var battgrouid=    $('#battgroup_name').attr('value');

            if(battgrouid!=0 && $('#lbottom .li-con li.b8cfe5').text().length>0){

                var binf=new Object();

                binf={

                    BattGroupId:battgrouid,

                    StationName:'',

                    StationName1:'',

                    BattGroupId: battgrouid,    // 电池组id

                    StationName: '',            // 机房名称

                    StationName2: '',            // 市 
                    StationName1: '',            // 省

                };

                var json=window.JSON.stringify(binf);

                $.post('BattInfAction!serchBatt','result='+json,function(data){

@@ -1296,9 +1454,10 @@
            if(stationname.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){

                var binf=new Object();

                binf={

                    BattGroupId:0,

                    StationName:stationname,

                    StationName1:'',

                    BattGroupId: 0,                // 电池组id

                    StationName: stationname,    // 机房名称

                    StationName2: '',            // 市 
                    StationName1: '',            // 省

                };

                var json=window.JSON.stringify(binf);

                $.post('BattInfAction!serchBatt','result='+json,function(data){

@@ -1456,13 +1615,14 @@
                }

            }

        }

        console.info(oldArrVal);

        //console.info(oldArrVal);

    }

    

    //显示所有的单元格

    function showAllTd(bigArrTxt,bigArrVal){

        var tmp = battstationList[0]?battstationList[0]:[];

        //创建表格

        createTablenew($('#tbroom'),ArrTh,battstationList[0]);

        createTablenew($('#tbroom'),ArrTh,tmp);

        //console.info(ArrTd);

        for(var i=1;i<battstationList.length;i++)

        {

@@ -1493,11 +1653,16 @@
        // 让容器内的表格宽度一致

        $('#rtop table').width(tbRoomWidth-20);

        getbattStationlength();

        //console.info(bigArrTxt);

        if(bigArrTxt.length != 0) {

            // 设备表格滚动到顶部

            scrollBottom($('#tbroom'), $('#tbroom table'));

            // 机房列表滚动到顶部

            scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));

        }else {

            alert('添加的内容已存在！');

        }

        

        // 设备表格滚动到顶部

        scrollBottom($('#tbroom'), $('#tbroom table'));

        // 机房列表滚动到顶部

        scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));

    }

    

    //添加表格的一行


 gx_tieta/WebRoot/elestatus.jsp

@@ -430,7 +430,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

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

                        optsList.push(tmp);

                    }

                    

@@ -455,7 +455,7 @@
            var tmp = {

                StationName1:$("#station_name1").val(),

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

                StationName3: $("#station_name").val(),

                StationName: $("#station_name").val(),

                StationId: stationid

            };

        


 gx_tieta/WebRoot/elewarn.jsp

@@ -649,7 +649,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -674,7 +674,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/WebRoot/endure.jsp

@@ -376,7 +376,7 @@
                        var _attr = {

                            StationId: __data.StationId

                        };

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

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

                        optsList.push(tmp);

                    }

                    


 gx_tieta/WebRoot/equip-charge-param.jsp

@@ -444,7 +444,7 @@
                        var __data = _data[i];

                        var _attr = {

                            'stataion_name1': __data.StationName1,

                            'stataion_name': __data.StationName3,

                            'stataion_name': __data.StationName,

                            'dev_name': __data.FBSDeviceName

                        };

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


 gx_tieta/WebRoot/equipHistWarn1.jsp

@@ -89,13 +89,18 @@
                    <!-- 维护区信息 -->

                    <table>

                        <tr class="fWeight">

                            <td><s:text name="Maintenance_area"/></td>                <!-- 维护区 -->

                            <td>省</td>                <!-- 省 -->

                            <td>市</td>                <!-- 市 -->

                            <td><s:text name="Computer_name"/></td>                    <!-- 机房站点（或机房设备） -->

                            <td colspan="2"><s:text name="Alarm_start_time"/></td>    <!-- 告警开始时间段 -->

                        </tr>

                        <tr>

                            <td>

                                <select id="station_name1" name="station_name1">

                                </select>

                            </td>

                            <td>

                                <select id="city" name="station_name2">

                                </select>

                            </td>

                            <td>

@@ -523,7 +528,8 @@
        });

    }

    

    $(document).ready(function(){

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

    $(document).ready(function(){

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

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

            data=data.result;

@@ -546,118 +552,99 @@
            }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.StationName, __data, _attr);

                    optsList.push(tmp);

                }

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

                createOptions($select, optsList, true);

            }else{

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

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

            }

            seachDevHisAlarm();

        });

    }

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

    $.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++){

                $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);	
                }					
                $select.append($option);

            }				
        }

        findStationNamebyStationname1();		
    });

    

    //当维护区的值变换时更新机房站点

    $('#station_name1').change(function(){

        findStationNamebyStationname1();

    // 根据机房名称查询电池组

    $('#station_name').change(function(){

        seachDevHisAlarm();

    });

	
    //根据维护区查询站点

    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++){

                    var $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].StationName){

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

                        }						
                    }					
                    $select.append($option);					
                }

                seachDevHisAlarm();

            }

        });

    } */

    

    //构造查询条件

    function createSearchParam(){

        var temp = {

            binf:{

                StationName:$('#station_name').val(),        //机房名

                StationName1:$('#station_name1').val(),        //维护区

                StationName2:$('#city').val(),        // 市

                StationName1:$('#station_name1').val(),        // 省

                BattProductDate:$('#starttime').val()+" 00:00:00",

                BattProductDate1:$('#endtime').val()+" 23:59:59",

            },

@@ -666,6 +653,7 @@
                pageCurr:Page.pageCurr,                        //当前页

            }

        };

        console.log(temp);

        return temp;

    }

    


 gx_tieta/WebRoot/equipWarn1.jsp

@@ -90,13 +90,18 @@
                    <!-- 维护区信息 -->

                    <table>

                        <tr class="fWeight">

                            <td><s:text name="Maintenance_area"/></td>                <!-- 维护区 -->

                            <td>省</td>                <!-- 省 -->

                            <td>市</td>                <!-- 市 -->

                            <td><s:text name="Computer_name"/></td>                    <!-- 机房站点（或机房设备） -->

                            <td><s:text name="Alarm"/><s:text name="Type"/></td>                <!-- 告警类型 -->

                        </tr>

                        <tr>

                            <td>

                                <select id="station_name1" name="station_name1">

                                </select>

                            </td>

                            <td>

                                <select id="city" name="station_name2">

                                </select>

                            </td>

                            <td>

@@ -561,6 +566,7 @@
        function createSearchParam(){

            var temp = {

                stationName1:$('#station_name1').val(),

                stationName2:$('#city').val(),

                stationName:$('#station_name').val(),

                alm_type:$('#alarm_type').val(),

                page:{

@@ -568,6 +574,7 @@
                    pageCurr:Page.pageCurr,                        //当前页

                }

            };

            console.log(temp);

            return temp;

        }

        

@@ -868,6 +875,7 @@
            return undefined;

        }

        

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

        $(document).ready(function(){

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

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

@@ -891,48 +899,82 @@
                }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.StationName, __data, _attr);

                        optsList.push(tmp);

                    }

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

                    createOptions($select, optsList, true);

                }else{

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

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

                }

                searchDevAlarm();

            });


 gx_tieta/WebRoot/equipment.jsp

@@ -930,7 +930,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                


 gx_tieta/WebRoot/index.jsp

@@ -597,7 +597,6 @@
                    

                    flushFourPie();        //更新四种饼状图

                });

	
                // 设置右键菜单

                var menu = new BMap.ContextMenu();

                var txtMenuItem = [

@@ -632,17 +631,7 @@
                                enparams:[e]

                            });

                        }

                    },

                    /* {

                        text: '机房定位',

                        callback: function(e) {

                            panel.setPanelLayout();

                            panel.showPanel();

                            $('#map .panel-mask').bind('click', function() {

                                panel.hidePanel();

                            });

                        }

                    } */

                    }

                ];

                //console.info(getPermit('taskchange_edit_permit', permits)+"*******");

                if(getPermit('batt_map_edit_permit', permits)) {

@@ -1594,6 +1583,7 @@
    function createMapDot(map, dotList) {

        // 清空覆盖物和对应的mk点

        mkList = [];

		
        // 遍历查询内容生成对应的图标

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

            var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30));    // 设置图片

@@ -1624,6 +1614,9 @@
            map.addOverlay(mk);

        }

    }

	
	
	
    

    // 

    

@@ -1966,10 +1959,86 @@
        }

    }

    

    searchStation();

    // 设置页面中的可视区域图标

    ;(function($, window, document, gl, undefined) {

        // 设置命名空间

        gl.namespace('BMap');

        // 根据可视范围显示坐标点

        var dots = [];

        var currMarkers = {};

        // 查询当前范围内容的图标

        function queryInRect(map, callback) {

            var cp = map.getBounds(); // 返回map可视区域，以地理坐标表示  
            var sw = cp.getSouthWest(); // 返回矩形区域的西南角  
            var ne = cp.getNorthEast(); // 返回矩形区域的东北角  
            //var zoom = map.getZoom(); //当前缩放级别 
            //console.log(dots);

            var mapDots = getDotsList(sw, ne);

            callback(map, mapDots);

        }

		
        // 获取dots的集合

        function getDotsList(sw, ne) {

            var rs = [];

                swlng=sw.lng,  
                swlat=sw.lat,  
                nelng=ne.lng,  
                nelat=ne.lat;

	            
                var maxLng = sw.lng>ne.lng?sw.lng:ne.lng;

                var minLng = sw.lng<ne.lng?sw.lng:ne.lng;

	            
                var maxLat = sw.lat>ne.lat?sw.lat:ne.lat;

                var minLat = sw.lat<ne.lat?sw.lat:ne.lat;

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

                    var dot = dots[i];

                    var lat = dot.lat;

                    var lng = dot.lng;

                    var sId = dot.binformation.StationId;

                    var isExist = checkMarker(sId);

	            	
                    // 未被添加过

                    if(!isExist) {

                        // 判断经纬度是否存在该区域

                        if(lng<maxLng && lng>minLng && lat<maxLat && lat>minLat) {

                            currMarkers['markers'+sId] = sId;

                            rs.push(dot);

                        }

                    }

                }

                return rs;

        }

		
		
        // 检测当前点是否已经被添加过

        function checkMarker(id) {

            var flag = false;

            // 遍历已经添加的点返回是否已经被添加过

            Object.keys(currMarkers).forEach(function(key) {

                if(currMarkers[key] == id) {

                    flag = true;

                }

            });

			
            return flag;

        }

		
        // 设置dots集合的值

        function setDots(data) {

            dots = data;

        }

        // 将变量绑定到命名空间下

        gl.BMap.setDots = setDots;

		
        // 将函数绑定到命名空间下

        gl.BMap.queryInRect = queryInRect;

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

	
    searchStation(true);

    var allStation;

    //查询机房

    function searchStation(){

    function searchStation(setRect){

        var temp = createSearchParam();

        var json = JSON.stringify(temp);

        commonDot = new Array();

@@ -1980,7 +2049,7 @@
            type: "post",                 

            //url: "BattMap_informationAction!searchAll",                

            url: "BattMap_informationAction!searchUserManageStation",                

            async:true,				
            async: true,				
            dataType:'text',

            data:"json="+json,        

            success: function(data){ 

@@ -1989,7 +2058,7 @@
                console.log(list.length);

                allStation = new Array();

                if(list!=undefined && list.length>0){

                    for(var i=0;i<10;i++){

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

                        var tmp = {

                            binformation:list[i].data,

                            alarm_num:list[i].code,        //告警数目

@@ -1999,10 +2068,17 @@
                        };

                        allStation.push(analyzeData(tmp));

                    }

                    //console.info(allStation);

                    createMapDot(map, allStation);

                    // 显示区域的图标

                    GLOBAL.BMap.setDots(allStation);

                    GLOBAL.BMap.queryInRect(map,createMapDot);

                    // 是否设置拖到和缩放

                    if(setRect) {

                        map.addEventListener("moveend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot));  // 拖动

                        map.addEventListener("zoomend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 缩放

                    }

                    

                    //setTimeout(searchStation, 4000);	
                    //createMapDot(map, allStation);

					
                }

            }                 

        });


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

@@ -301,13 +301,12 @@
            success: function(data){

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

                treeView.delProgress(container);

                console.info(rs);

                if(rs.code == 1) {

                    var _data= rs.data;

                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFolder(__data.StationName3, 'home', __data);

                        var tmp = treeView.getFolder(__data.StationName, 'home', __data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);

@@ -329,7 +328,7 @@
        var tmp = {

            StationName1: data.StationName1,

            StationName2: data.StationName2,

            StationName3: data.StationName3,

            StationName: data.StationName,

            StationId: data.StationId

        };

        fourth(treeView, container, tmp, true);

@@ -357,7 +356,7 @@
                    var formatData = [];

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

                        var __data = _data[i];

                        var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);

                        var tmp = treeView.getFile(__data.StationName, 'home', '',__data);

                        formatData.push(tmp);

                    }

                    treeView.treeView(container, formatData);


 gx_tieta/WebRoot/taskplan.jsp

@@ -546,7 +546,7 @@
                    var _attr = {

                        StationId: __data.StationId

                    };

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

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

                    optsList.push(tmp);

                }

                

@@ -571,7 +571,7 @@
        var tmp = {

            StationName1:$("#station_name1").val(),

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

            StationName3: $("#station_name").val(),

            StationName: $("#station_name").val(),

            StationId: stationid

        };

    


 gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java

@@ -304,7 +304,7 @@
                " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +

                " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +

                " and db_user.tb_user_inf.uid=? " +

                " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";

                " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";

        baseSql+=userSql;

        

        String endSql="order by tb_battdischarge_plan.discharge_starttime desc ";

@@ -320,6 +320,7 @@
                             uinf.getUId(),

                             "%"+binf.getStationName1()+"%",

                             "%"+binf.getStationName()+"%",

                             "%"+binf.getStationName2()+"%",

                             (bmd.getPage().getPageCurr() - 1)* bmd.getPage().getPageSize(),

                             bmd.getPage().getPageSize()

                             }, new CallBack() {


 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java

@@ -354,6 +354,14 @@
        }else{

            baseSql+=station1SqlF;

        }

        //用于维护区

        String station2SqlT=" and stationname2!=? ";//全部

        String station2SqlF=" and stationname2=? ";

        if(binf.getStationName2().equals("")){

            baseSql+=station2SqlT;

        }else{

            baseSql+=station2SqlF;

        }

        //用于机房站点

        String stationSqlT=" and stationname!=? ";//全部

        String stationSqlF=" and stationname=? ";

@@ -373,7 +381,7 @@
        String endSql=" order by stationid ";

        sql=baseSql+endSql;

        //System.out.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName2(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -3304,12 +3312,12 @@
    //查询管理的机房(左侧导航第三层，查所有的机房,num中存放uid)

    public List serchStationName3(Object obj){

        BattInf binf=(BattInf) obj;

        String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName  " +

        String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName  " +

                " FROM db_battinf.tb_battinf " +

                " where StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +

                " ) and StationName1 like ? and StationName2 like ?  " +

                " ORDER BY CONVERT( StationName3 USING gbk ) COLLATE gbk_chinese_ci ASC ";

                " ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {

            

            public List getResults(ResultSet rs) {

@@ -3317,6 +3325,7 @@
                    try {

                        while(rs.next()){

                            BattInf batt = new BattInf();

                            batt.setStationName(rs.getString("stationName"));

                            batt.setStationName1(rs.getString("stationName1"));

                            batt.setStationName2(rs.getString("stationName2"));

                            batt.setStationName3(rs.getString("stationName3"));

@@ -3340,7 +3349,7 @@
    public List serchBattByStation(Object obj){

        BattInf binf=(BattInf) obj;

        String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +

                "from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName3 like ?  ";

                "from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName like ?  ";

        //机房id

        String idSqlT=" and  Stationid like ? ";

        sql+=idSqlT;

@@ -3352,7 +3361,7 @@
        //排序

        String orderSql=" ORDER BY StationName1,battgroupId ";

        //System.out.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list = new ArrayList();


 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java

@@ -329,6 +329,14 @@
        }else{

            baseSql+=stationSqlF;

        }

        //用于机房站点

        String stationSql2T=" and stationname2!=? ";//全部

        String stationSql2F=" and stationname2=? ";

        if(ddata.getStationName2().equals("")){

            baseSql+=stationSql2T;

        }else{

            baseSql+=stationSql2F;

        }

        //用于故障事件

        String almTypeT=" and alm_type!=? ";//全部

        String almTypeF=" and alm_type=? ";

@@ -350,7 +358,7 @@
        //分页

        String limitSql=" LIMIT ?,? ";

        sql=baseSql+endSql+limitSql;

        List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

        List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();


 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java

@@ -69,7 +69,7 @@
        String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +

                " alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +

                " DISTINCTbinf.stationName,DISTINCTbinf.FbsDeviceName " +

                " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf  where db_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? )  as DISTINCTbinf    " +

                " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf  where db_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ?)  as DISTINCTbinf    " +

                " WHERE  tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId  " +

                " AND alm_start_time>=? and alm_start_time<=? ";

         

@@ -92,7 +92,7 @@
        

        sql=baseSql+endSql+limitSql;

        

        List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",binf.getBattProductDate(),binf.getBattProductDate1()

        List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()

            ,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()

            ,page.getPageSize()}, new CallBack() {

                


 gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java

@@ -110,7 +110,7 @@
                " where  alm_id in(?,?,?,?,?,?)  and alm_signal_id%2 in(?,?)  " +

                " and alm_level in(?,?,?,?) " +

                " and alm_start_time>=? and alm_start_time<=?  " +

                " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? ";

                " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? ";

        /*//用于实时告警

        String almSqlT="and alm_cleared_type=?  ";

        //历史告警

@@ -169,6 +169,7 @@
                        adata_H.getAlm_start_time1(),

                        "%"+binf.getStationName1()+"%",

                        "%"+binf.getStationName()+"%",

                        "%"+binf.getStationName2()+"%",

                        //adata_H.getAlm_cleared_type(),

                        

                        


 gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java

@@ -115,7 +115,8 @@
                " alm_low_level,alm_high_en,alm_low_en," +

                " db_battinf.tb_battinf.stationname " +

                " from db_param.tb_dev_param,db_battinf.tb_battinf " +

                " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " ;

                " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " +

                " and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?  and db_battinf.tb_battinf.StationName like ? " ;

        //设备id条件

        String devSqlT=" and dev_id=? ";

        String devSqlF=" and dev_id!=? ";

@@ -135,7 +136,7 @@
        String endSql=" order by db_param.tb_dev_param.num asc ";

        //最终的SQl

        sql=baseSql+endSql;

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -261,4 +262,15 @@
        });

        return list;

    }

    public static void main(String[] args) {

        Dev_paramImpl impl=new Dev_paramImpl();

        Dev_param dparam=new Dev_param();

        dparam.setDev_id(618500001);

        dparam.setAlm_id(0);

        dparam.setStationName("城市-区县-武汉源暢实验室-61850设备");

        dparam.setStationName1("");

        dparam.setStationName2("");

        List list=impl.serchByCondition(dparam);

        System.out.println(list.size());

    }

}


 gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java

@@ -22,6 +22,7 @@
    private String dev_name;//设备名称

    private String stationName;//机房名称

    private String stationName1;//维护区名称

    private String stationName2;//市级

    private String stationId;//机房id

    private Page page;//分页

    private User_inf uinf;

@@ -149,6 +150,12 @@
    public void setStationName1(String stationName1) {

        this.stationName1 = stationName1;

    }

    public String getStationName2() {

        return stationName2;

    }

    public void setStationName2(String stationName2) {

        this.stationName2 = stationName2;

    }

    @Override

    public String toString() {

        return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id

@@ -160,8 +167,9 @@
                + alm_confirmed_time + ", alm_cleared_type=" + alm_cleared_type

                + ", usr_id=" + usr_id + ", note=" + note + ", dev_name="

                + dev_name + ", stationName=" + stationName + ", stationName1="

                + stationName1 + ", stationId=" + stationId + ", page=" + page

                + ", uinf=" + uinf + "]";

                + stationName1 + ", stationName2=" + stationName2

                + ", stationId=" + stationId + ", page=" + page + ", uinf="

                + uinf + "]";

    }

    

    


 gx_tieta/src/com/fgkj/dto/Dev_param.java

@@ -13,6 +13,10 @@
    private Integer alm_low_level;

    private Integer alm_high_en;

    private Integer alm_low_en;

	
    private String stationName;

    private String stationName1;

    private String stationName2;

    private String note;

    

    public Integer getNum() {

@@ -82,6 +86,24 @@
    public void setNote(String note) {

        this.note = note;

    }

    public String getStationName() {

        return stationName;

    }

    public void setStationName(String stationName) {

        this.stationName = stationName;

    }

    public String getStationName1() {

        return stationName1;

    }

    public void setStationName1(String stationName1) {

        this.stationName1 = stationName1;

    }

    public String getStationName2() {

        return stationName2;

    }

    public void setStationName2(String stationName2) {

        this.stationName2 = stationName2;

    }

    @Override

    public String toString() {

        return "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="

@@ -89,8 +111,11 @@
                + alm_high_coe + ", alm_low_coe=" + alm_low_coe

                + ", alm_high_level=" + alm_high_level + ", alm_low_level="

                + alm_low_level + ", alm_high_en=" + alm_high_en

                + ", alm_low_en=" + alm_low_en + ", note=" + note + "]";

                + ", alm_low_en=" + alm_low_en + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2="

                + stationName2 + ", note=" + note + "]";

    }

    

    

	
}


 gx_tieta/src/com/fgkj/services/BattTest_ResService.java

@@ -224,6 +224,7 @@
        BattInf binf=new BattInf();

        binf.setStationName("");

        binf.setStationName1("");

        binf.setStationName2("");

        binf.setBattGroupId(0);

        binf.setBattGroupName1("");

        binf.setBattProducer("");

@@ -240,13 +241,13 @@
        mainf.setMaint_done_time1(ActionUtil.getSimpDate(date2));

        

        Batttestdata_inf tdata=new Batttestdata_inf();

        tdata.setTest_type(0);

        tdata.setTest_type(2);

        tdata.setTest_starttype(0);

        tdata.setRecord_time(ActionUtil.getSimpDate(date1));

        tdata.setRecord_time1(ActionUtil.getSimpDate(date2));

        

        User_inf uinf=new User_inf();

        uinf.setUId(0);

        uinf.setUId(1002);

        

        Page p = new Page();

        p.setPageCurr(1);

@@ -258,7 +259,7 @@
        bmd.setTdata(tdata);

        bmd.setMainf(mainf);

        bmd.setUinf(uinf);

        bservice.serchByCondition(bmd);



        List list=bservice.serchByCondition(bmd);

        System.out.println(list.size());

    }

}