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

81041

2018-11-21 9b5bed11d3b746a2cb6b16d1c7db3eb477c90743

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

 gx_tieta/WebRoot/dischargetest.jsp

@@ -209,7 +209,7 @@
                        </tr>

                        <tr>

                            <th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 升压上限 -->（V）</th>

                            <th><s:text name="Charging_current"/><!-- 充电电流 -->（A）</th>

                            <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 充电电流 -->（A）</th>

                        </tr>

                        <tr>

                            <td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>

@@ -732,46 +732,95 @@
                    };    // 充电电流

                    

                    $('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');

                    $('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');

                }

            });

        })(jQuery);

        

        // 更改放电面板的值后

        $(function() {

            $('.popup.fbs9100 .popup-tbl td i').tooltip();

            // 监测面板中的input改变触发$.checkTestInfor()事件

            $('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {

            // 放电电流

            $('#discurr').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 1000,

                msg: '取值范围0~1000A'

            });

			
            // 放电小时率

            $('#hourrate').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 放电电容

            $('#discap').testVal({

                pattern: /^[0-9]+$/,

                regVal: true,

                min: 0,

                max: 90000,

                msg: '取值范围0~90000AH'

            });

			
            // 放电时长

            $('#distime').testVal({

                pattern: /^[0-9]+$/,

                regVal: true,

                min: 0,

                max: 5940,

                msg: '取值范围0~5940分钟'

            });

			
            // 单体下限阀值

            $('#MonomerVol_low').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 20,

                msg: '取值范围0~20V'

            });

			
            // 组端下限阀值GroupVol_low

            $('#GroupVol_low').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: true,

                min: 0,

                max: 60,

                msg: '取值范围0~60V'

            });

			
            // 单体下限数量

            $('#MonomerlowCount').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 升压上限

            $('#MonomerlowCount').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 充电电流

            $('#ChargeCurrSet').testVal({

                pattern: /^[0-9]+(\.[0-9]*)?$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            // 温度上限

            $('#TempUpHighLimit').testVal({

                pattern: /^[0-9]+$/,

                regVal: false,

                msg: '输入的数据格式不正确'

            });

			
            $('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {

                $.checkTestInfor();

                var bool = $.regPositiveNum($(this).val());

                if(bool) {

                    // 读取放电参数成功执行

                    if($.disTestInfor.success) {

                        paramsBtn.ensure(true);

                    }

                    $(this).next('i').removeClass('error-data');

                    $(this).myTooltip('hide');

                }else {

                    paramsBtn.ensure(false);

                    //var errorImg = $('<i class="fa fa-frown-o error-img"></i>');

                    $(this).next('i').addClass('error-data');

                    $(this).myTooltip({

                        position: 'top',

                        thing: 'show',

                        content: '<span style="color:#FF0000">数据格式错误(请输入正数)</span>'

                    });

                }

            });

			
            // 当文本框获取焦点时

            $('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {

                if($(this).next('i').hasClass('error-data')) {

                    $(this).myTooltip('show');

                }

            });

			
            // 文本框失去焦点

            $('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {

                $(this).myTooltip('hide');

            });

            

            $('.popup.fbs9100').on('change', 'select', function() {

@@ -1128,6 +1177,17 @@
                        $('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);

                        $('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);

                        $('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);

						
                        // 充电电流

                        $('#ChargeCurrSet').testVal('option', 'allOpts', {

                            regVal: true,

                            min: 0,

                            max: list[0].binf.charge_curr_max,

                            msg: '取值范围0~'+list[0].binf.charge_curr_max+'A'

                        });

						
                        // 设置文本值

                        $('#ChargeCurrSetLabel').text('充电电流（0~'+list[0].binf.charge_curr_max+'A）');

                    }                

                }

            }


 gx_tieta/WebRoot/ele_statistics.jsp

@@ -267,6 +267,7 @@
            var load = layer.load(1);

            //console.info($("#search_form").serialize());

            var temp = createSearchForm();

            console.info(temp);

            var json = JSON.stringify(temp);

            battinfo_list = new Array();

            $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){


 gx_tieta/WebRoot/index.jsp

@@ -121,7 +121,7 @@
                        <div class="map-info-detail">

                            <div class="layui-collapse" lay-filter="test" lay-accordion="">

                                <div class="layui-colla-item">

                                    <h2 class="layui-colla-title">定位机房</h2>

                                    <h2 class="layui-colla-title">搜索机房</h2>

                                    <div class="layui-colla-content layui-show">

                                        <table>

                                            <tbody>

@@ -216,12 +216,12 @@
                        <i class="fa fa-cog"></i>

                    </a>

                </div>

                <!--电池故障修复图-->

                <div class="repair-pie module"></div>

                <!-- 电池故障饼状图 -->

                <div class="brdn-pie module"></div>

                <!-- 电池告警饼状图 -->

                <div class="warn-pie module"></div>

                <!--电池故障修复图-->

                <div class="repair-pie module"></div>

                <!--电池健康饼状图-->

                <div class="health-pie module"></div>

                <!--清除浮动-->

@@ -721,7 +721,7 @@
                        }

                    },

                    {

                        text: '恢复正常',

                        text: '退出全屏显示',

                        callback: function(e) {

                            // console.info(e);

                            smallMap();

@@ -1104,7 +1104,7 @@
                    powercut_isNew = false;

                    createPie(repairPie,repairTle,repairObj);

                    repairPie.on('click', function() {

                        window.open('powercut.jsp?power_state=0');

                        window.open('batt-state-manage.jsp?power_state=0');

                    });

                }else{

                    var opt = getOpt(repairTle, repairObj);


 gx_tieta/WebRoot/js/dischargetest/bts.js

@@ -90,7 +90,7 @@
        pattern: /^[0-9]+(\.[0-9]*)?$/,

        regVal: true,

        min: 0,

        max: 20,

        max: 60,

        msg: '取值范围0~60V'

    });

    

@@ -218,8 +218,8 @@


// 设置参数

function setBTSParam(list, errorStatus) {

    //setDischageBattinfo(list[0].fsparam.BattGroupNum);                //设置被测电池组信息

    console.log(list);

    // setDischageBattinfo(list[0].fsparam.BattGroupNum);                //设置被测电池组信息

    // console.log(list);

    if(list[0].fsparam.TestCmd == CMD_BTS_StartDischarge){

        $('#discharge_type').val(CMD_BTS_StartDischarge);

    }else if(list[0].fsparam.TestCmd == CMD_BTS_StartRESTest){

@@ -247,6 +247,7 @@
        msg: '取值范围0~'+list[0].binf.charge_curr_max+'A'

    });

    

    // 设置文本值

    $('#ChargeCurrSetLabel').text('充电电流（0~'+list[0].binf.charge_curr_max+'A）');

}




 gx_tieta/WebRoot/mobil/battM.html

@@ -14,7 +14,7 @@
        <!-- 三级菜单内容    -->

        <div data-role="page">

            <div data-role="header" data-position="fixed">

                <a href="machineroomM.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

                <a href="selectbatt.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

                <h1>蓄电池组</h1>

            </div>

    


 gx_tieta/WebRoot/mobil/ele-infor-search2.html

@@ -263,33 +263,43 @@
     //查询电池信息

     function searchBadBatt(){

         loadshow();

         var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

        var temp = createSearchForm();

        console.info(stationid);

        /*var temp = {

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

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

            StationName5: $("#county").val(),

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

            StationId: stationid

        };*/

        //console.info(temp);

         var json = JSON.stringify(temp);

         //console.info(json);

        arrTd = new Array();

        $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){

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

            console.info(data);

            //console.info(data);

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

                data=data.data;

                //console.info(data);                    

                arr=new Array();

                index=0;

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

                    Page.pageAll=data[i].page.pageAll;

                    arr[index++]=data[i].binf.BattGroupId;                //电池组id

                    arr[index++]=data[i].binf.StationName;                //机房名称

                    arr[index++]=data[i].binf.StationIp;                    //机房IP

                    arr[index++]=data[i].binf.BattGroupName;    //电池组名称

                    arr[index++]=data[i].binf.BattGroupNum;                //电池组序号

                    arr[index++]=data[i].binf.MonCount;                    //单体数量

                    arr[index++]=data[i].binf.MonCapStd;                    //标称容量

                    arr[index++]=data[i].binf.MonVolStd;                    //标称单体电压

                    arr[index++]=data[i].binf.BattProducer;                //电池品牌

                    arr[index++]=data[i].binf.BattProductDate.substr(0,10);            //电池生产日期

                    arr[index++]=data[i].binf.BattInUseDate.substr(0,10);                //电池安装日期	
                    Page.pageAll=data[i].Size;

                    arr[index++]=data[i].BattGroupId;                //电池组id

                    arr[index++]=data[i].StationName;                //机房名称

                    arr[index++]=data[i].StationIp;                    //机房IP

                    arr[index++]=data[i].BattGroupName;    //电池组名称

                    arr[index++]=data[i].BattGroupNum;                //电池组序号

                    arr[index++]=data[i].MonCount;                    //单体数量

                    arr[index++]=data[i].MonCapStd;                    //标称容量

                    arr[index++]=data[i].MonVolStd;                    //标称单体电压

                    arr[index++]=data[i].BattProducer;                //电池品牌

                    arr[index++]=data[i].BattProductDate.substr(0,10);            //电池生产日期

                    arr[index++]=data[i].BattInUseDate.substr(0,10);                //电池安装日期	
                }

               console.info(Page);

               //console.info(Page);

               createTbl(tbl, arrTh, arr);

              

            }else{

@@ -297,7 +307,7 @@
                Page.pageAll = 0;

            }

            setPage();

            console.info(Page);

            //console.info(Page);

            loadclose();     

        }).error(function(){

            loadclose();

@@ -317,7 +327,7 @@
            binf:{

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

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

                StationName5:$('#county').val(),

                StationName5:$('#country').val(),

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

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

                BattProducer:$('#batt_producer').val(),

@@ -354,7 +364,7 @@
        data = data.result;

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

        //console.info(data);

        console.info(data.code);

        //console.info(data.code);

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

               var $Ostation_name1=$("#mainteArea");

            $Ostation_name1.text("");

@@ -384,7 +394,7 @@
        var data = {

            StationName1: $("#mainteArea").val()

        };

        console.info(data);

        //console.info(data);

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

        $.ajax({     

            type: "post",                 

@@ -395,8 +405,8 @@
            success: function(data){

            data = data.result;

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

            console.info(data);

            console.info(data.code);	   
            //console.info(data);

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

                   var $Ostation_name1=$("#city");

                $Ostation_name1.text("");

@@ -428,7 +438,7 @@
            StationName1: $("#mainteArea").val(),

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

        };

        console.info(data);

        //console.info(data);

        $.ajax({     

            type: "post",                 

            url: "BattInfAction!serchStationName5",                

@@ -438,8 +448,8 @@
            success: function(data){

            data = data.result;

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

            console.info(data);

            console.info(data.code);	   
            //console.info(data);

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

                   var $Ostation_name1=$("#country");

                $Ostation_name1.text("");

@@ -482,10 +492,64 @@
            success: function(data){

            data = data.result;

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

            console.info(data);

            console.info(data.code);	   
            //console.info(data);

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

                   var $Ostation_name1=$("#homeName");

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               stationid:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName3,

                               stationid:data.data[i-1].StationId,

                               txt:data.data[i-1].StationName3,

                           });

                       }

                }

                //console.info(111111111111111);

                updataSelStation($Ostation_name1, arr);

            }

	       
            findserchByBattGroupNamebystationname(); 
        }

        });

    }

 
 //根据机房获取电池组   
     function findserchByBattGroupNamebystationname(){

        var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

	
        var data = {

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

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

            StationName5:$("#country").val(),

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

            StationId: stationid

        };

		
        //console.info(data);

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchBattByStation",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            //console.warn();

            //console.info(data);

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

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

                $Ostation_name1.text("");

                var arr = new Array();

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

@@ -497,59 +561,8 @@
                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationId,

                               txt:data.data[i-1].StationName3,

                           });

                       }

                }

                console.info(111111111111111);

                updataSelStation($Ostation_name1, arr);

            }

	       
            findserchByBattGroupNamebystationname(); 
        }

        });

    }

 
 //根据机房获取电池组   
     function findserchByBattGroupNamebystationname(){

		
        var data = {

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

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

            StationName5:$("#country").val(),

            StationName: $("#homeName").text(),

            StationId: $("#homeName").val()

        };

		
        console.info(data);

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchStationName3",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            console.warn();

            console.info(data);

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

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

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName3,

                               txt:data.data[i-1].StationName3,

                               val:data.data[i-1].BattGroupId,

                               txt:data.data[i-1].BattGroupName,

                           });

                       }

                }

@@ -560,12 +573,19 @@
        });

    }

    

   //当维护区改变时更新站点

   //当省改变时更新市

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

           findCity();    

        findStationNamebyStationname1();

   }); 	
		
   });

   //当市改变时改变区/县

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

           findCounty();	
   });

   //当区/县改变时改变机房

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

           findStationNamebyStationname1(); 	
   });   	
    //当机房改变时，更新电池组	
    $('#homeName').change(function(){

        findserchByBattGroupNamebystationname();

    });

@@ -610,7 +630,7 @@
    $.post("BattInfAction_serchByMonVolStd",null,function(data){

        data=data.result;

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

        console.info(data);

        //console.info(data);

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

            var $Omonvol_std=$("#monvol_std");

            $Omonvol_std.text("");

@@ -639,7 +659,7 @@
        if(data.code==1 && data.data.length>0){

            var $Omoncap_std2=$("#moncap_std2");

            $Omoncap_std2.text=("");

            console.info(data.data[1].MonCapStd);

            //console.info(data.data[1].MonCapStd);

            var arr = new Array();

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

                if(i == 0){


 gx_tieta/WebRoot/mobil/eleAnalyse.html

@@ -21,10 +21,18 @@
                <div class="fg-panel-header">筛选</div>

                <div class="fg-panel-content">

                    <fieldset data-role="controlgroup">

                        <p>维护区</p>

                        <p>省</p>

                        <select id="mainteArea" data-mini="true">

                              <option value="">全部</option>

                        </select>

                        <p>市</p>

                        <select id="city" data-mini="true">

                            <option value="">全部</option>

                        </select>

                        <p>区/县</p>

                        <select id="country" data-mini="true">

                            <option value="">全部</option>

                        </select>

                         <p>机房站点</p>

                        <select id="homeName" data-mini="true">

                            <option value="">全部</option>

@@ -394,10 +402,11 @@
                alltestDate = new Array();            //所有测试记录的时间数组

                var json = JSON.stringify(createSearchForm());

                loadshow();

                //console.info(json);

                console.info(json);

                $.post('Batt_Maint_DealarmAction_serchLow',"result="+json,function(data){

                        arr=new Array();

                        groupidlist=new Array();

                        console.info(data);

                        data=data.result;

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

                        allDate=new Array();

@@ -526,6 +535,8 @@
                    },

                    binf:{

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

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

                        StationName5: $('#country').val(),

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

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

                        BattProducer:$('#batt_producer').val(),

@@ -555,102 +566,236 @@
                return temp;

            }

                

			
            //页面加载时查询维护区中的枢纽类型 
            $.post("BattInfAction_serchByStation",null,function(data){

                data = data.result;

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

                //console.info(data);

               // console.info(data.code)

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

                       var $Ostation_name1=$("#mainteArea");

                       var arr = new Array();

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

                           if(i == 0) {

                               arr.push({

                                   val: "",

                                   txt: "全部(共"+data.sum+"个)"

                               });

                           }else {

                               arr.push({

                                   val: data.data[i-1].StationName1,

                                   txt: data.data[i-1].StationName1

                               });

                           }

                       }

                       updataSel($Ostation_name1, arr);

                   }

                findStationNamebyStationname1();

            });

    //页面加载时查询省

    $.post("BattInfAction_serchByStation",null,function(data){

        data = data.result;

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

        //console.info(data);

        //console.info(data.code);

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

               var $Ostation_name1=$("#mainteArea");

            $Ostation_name1.text("");

            var arr = new Array();

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

            {

                   if(i == 0){

                       arr.push({

                           val:"",

                           txt:"全部(共"+data.sum+"个)",

                       });

                   }else{

                       arr.push({

                           val:data.data[i-1].StationName1,

                           txt:data.data[i-1].StationName1,

                       });

                   }

            }

            updataSel($Ostation_name1, arr);

        }

         findCity();

    });



  
//当省改变时更新市

    function findCity(){

        var data = {

            StationName1: $("#mainteArea").val()

        };

        //console.info(data);

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

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchStationName2",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            //console.info(data);

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

                   var $Ostation_name1=$("#city");

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName2,

                               txt:data.data[i-1].StationName2,

                           });

                       }

                }

                updataSel($Ostation_name1, arr);

            }

             findCounty();

        }

        });

    }

	
//当市改变时更新区/县

    function findCounty(){

        var data = {

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

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

        };

        //console.info(data);

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchStationName5",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            //console.info(data);

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

                   var $Ostation_name1=$("#country");

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName5,

                               txt:data.data[i-1].StationName5,

                           });

                       }

                }

                updataSel($Ostation_name1, arr);

            }

          findStationNamebyStationname1();   
        }

        });

    }

  
 //当区县更新时更新机房  
    function findStationNamebyStationname1(){

        var data = {

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

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

            StationName5:$("#country").val()

        };

        //console.info(data);

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchStationName3",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            //console.info(data);

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

                   var $Ostation_name1=$("#homeName");

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:"",

                               stationid:"",

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].StationName,

                               stationid:data.data[i-1].StationId,

                               txt:data.data[i-1].StationName3,

                           });

                       }

                }

                //console.info(111111111111111);

                updataSelStation($Ostation_name1, arr);

            }

	       
            findserchByBattGroupNamebystationname(); 
        }

        });

    }

 
 //根据机房获取电池组   
     function findserchByBattGroupNamebystationname(){

        var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';

	
        var data = {

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

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

            StationName5:$("#country").val(),

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

            StationId: stationid

        };

        

               //当维护区改变时更新站点

            $('#mainteArea').change(function(){	
                findStationNamebyStationname1();

            });

		 	  
           function findStationNamebyStationname1(){

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

		 	   
                $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){

					
                    data=data.result;

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

                    //console.info(data);

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

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

                        var arr = new Array();

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

                                //if(i == 0) {

                                //    arr.push({

                                //        val: "",

                                //        txt: "全部(共"+data.sum+"个)"

                                //    });

                                //}else {

                                    arr.push({

                                        val: data.data[i].StationName,

                                        txt: data.data[i].StationName

                                    });

                                //}

                            }

                            updataSel($select, arr);

                    }

                    findserchByBattGroupNamebystationname();

                });

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

                    findserchByBattGroupNamebystationname();

                });

            }

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

            function findserchByBattGroupNamebystationname(){

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

                var station_name=$("#homeName 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.length);		
                    if(data.code==1 && data.data.length>0){	
                        var $Obattgroup_name = $("#battgroup_name");

                        var arr = new Array();

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

                                if(i == 0) {

                                    arr.push({

                                        val: "0",

                                        txt: "全部(共"+data.sum+"组)"

                                    });

                                }else {

                                    arr.push({

                                        val: data.data[i-1].BattGroupId,

                                        txt: data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"节"

                                    });

                                }

                            }

                            updataSel($Obattgroup_name, arr);

                    }

                });

            }

        //console.info(data);

        $.ajax({ 	
            type: "post", 				
            url: "BattInfAction!serchBattByStation",				
            async:true,				
            dataType:'json',

            data:"json = "+JSON.stringify(data),	
            success: function(data){

            data = data.result;

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

            //console.warn();

            //console.info(data);

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

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

                $Ostation_name1.text("");

                var arr = new Array();

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

                {

                       if(i == 0){

                           arr.push({

                               val:0,

                               txt:"全部(共"+data.data.length+"个)",

                           });

                       }else{

                           arr.push({

                               val:data.data[i-1].BattGroupId,

                               txt:data.data[i-1].BattGroupName,

                           });

                       }

                }

                updataSel($Ostation_name1, arr);

            }

	         
        }

        });

    }

    
   //当省改变时更新市

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

           findCity();	
   });

   //当市改变时改变区/县

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

           findCounty();	
   });

   //当区/县改变时改变机房

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

           findStationNamebyStationname1(); 	
   });   	
    //当机房改变时，更新电池组	
    $('#homeName').change(function(){

        findserchByBattGroupNamebystationname();

    });

    

        

            //查询电池容量


 gx_tieta/WebRoot/mobil/mobilJs/base.js

@@ -363,7 +363,7 @@
        // 根据vals和txt值生成option

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

            

            var opt = $('<option value="'+opts[i].txt+'" stationid="'+opts[i].val+'">'+opts[i].txt+'</option>');

            var opt = $('<option value="'+opts[i].val+'" stationid="'+opts[i].stationid+'">'+opts[i].txt+'</option>');

            element.append(opt);

        }

    }


 gx_tieta/WebRoot/mobil/selectbatt.html

@@ -14,8 +14,8 @@
        <!-- 三级菜单内容    -->

        <div data-role="page">

            <div data-role="header" data-position="fixed">

                <a href="machineroomM.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

                <h1>蓄电池组</h1>

                <a href="selectcounty.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>

                <h1>机房</h1>

            </div>

    

            <div data-role="content">