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

81041

2018-11-23 07ad76ca66cc831264f2b6adbacc502ad484f283

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

 gx_tieta/WebRoot/batt-state-statistical.jsp

@@ -105,17 +105,17 @@
        <div id="paging">

            <a href="javascript:" class="search"><s:text name="Search"/></a>        <!-- 查询 -->

            <a href="javascript:" id="export_table"><s:text name="Export"/></a>        <!-- 导出 -->

            <span id="current">1/1</span>

            <span><s:text name="Each_page"/><!-- 每页 --><input type="text" id="number" value="10"/><s:text name="Item"/><!-- 条 --></span>

            <!-- <span id="current">1/1</span>

            <span><s:text name="Each_page"/>每页<input type="text" id="number" value="10"/><s:text name="Item"/>条</span> -->

            <s:text name="Total_data"/><!-- 数据总量 --><span id="total">0</span>&nbsp;&nbsp;

            <a href="javascript:" id="home"><s:text name="HomePage"/><!-- 首页 --></a> 
            <a href="javascript:" id="pre"><s:text name="Page_Up"/><!-- 上一页 --></a>

            <a href="javascript:" id="next_p"><s:text name="Page_Down"/><!-- 下一页 --></a>

            <a href="javascript:" id="last"><s:text name="End_Page"/><!-- 尾页 --></a>

            <!-- <a href="javascript:" id="home"><s:text name="HomePage"/>首页</a> 
            <a href="javascript:" id="pre"><s:text name="Page_Up"/>上一页</a>

            <a href="javascript:" id="next_p"><s:text name="Page_Down"/>下一页</a>

            <a href="javascript:" id="last"><s:text name="End_Page"/>尾页</a>

            <span id="cont">

                <s:text name="Goto"/><!-- 转到 --><input type="text" id="page_num" value="1"/>

                <a href="javascript:" id="go"><s:text name="Jump"/><!-- 跳转 --></a>

            </span>

                <s:text name="Goto"/>转到<input type="text" id="page_num" value="1"/>

                <a href="javascript:" id="go"><s:text name="Jump"/>跳转</a>

            </span> -->

        </div>

    </div>

    <div id="details"></div>

@@ -168,7 +168,7 @@
                ]]

                ,data:[]

                ,page: false

                ,height: 'full-280'

                ,height: 'full-270'

            };

            

            // 生成表格数据

@@ -252,21 +252,24 @@
                    dataType:'json',

                    data:"json="+json,

                    success:function(data){

                        //console.info(data);

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

                        console.info(data);

                        if(data.code==1&&data!=null){

                            //console.log(data.data);

                            tOptions.data = data.data;

                            $('#total').text(data.data.length);

                         }else {

                             tOptions.data = [];

                             $('#total').text(0);

                         }

                         layer.close(load);

                         tOptions.limit = tOptions.data.length;

                         table.render(tOptions);

                         

                         // 触发window的resize事件显示最右侧的详情信息浮动

                         $(window).resize();

                    }

                })

                });

            }

            

            // 构造查询条件


 gx_tieta/WebRoot/ele-param.jsp

@@ -238,7 +238,7 @@
        ]; 

        

        defaultArr = [

            '35000001','省','城市', '区县', '机房名称', '设备名称', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9600',

            '35000001','省','城市', '区县', '机房名称', '设备名称', '192.168.0.5', '0', '192.138.0.10','255.255.255.0','192.168.0.1', 'FBS-9100',

            '0', '1000001', '1', '新建电池组1', '2.230', '2.150', '30', '24', '3000',

            '2', '0.2', '5000', '0.05',15,0,'', '双登', 'GMF-3000', '2012-05-04', '2012-06-13', ''

        ];

@@ -452,9 +452,9 @@
            var _arr = new Array();

            var _tblTr = $('.tbl-body table tbody tr');

            _tblTr.eq(_tblTr.length-1).find('td').each(function(i) {

                if(i == 10) {

                if(i == 12) {

                    _arr.push(0);

                }else if(i == 11) {

                }else if(i == 13) {

                    _arr.push(parseInt($(this).text())+1);

                }else {

                    _arr.push($(this).text());


 gx_tieta/WebRoot/mobil/equiphistwarn.html

@@ -35,11 +35,7 @@
                     <p>机房站点</p>

                    <select id="homeName" data-mini="true" name="bmd.binf.stationName">

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

                    </select>

                    <p>蓄电池组</p>

                    <select id="battgroup_name" data-mini="true" name="bmd.binf.BattGroupId">

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

                    </select>

                    </select>     
                                        

                    <fieldset data-role="collapsible" data-collapsed="false" data-mini="true">

                        <legend><strong>时间段选择：</strong></legend>

@@ -153,7 +149,7 @@
            //console.info("开始查询");

            newArrTd = new Array();

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

            $.post("Batt_devalarm_dataAction!serchByCondition","json="+json,function(data){

            $.post("Batt_devalarm_data_historyAction!serchByCondition","json="+json,function(data){

                data=data.result;

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

                //console.info(data);

@@ -197,14 +193,16 @@
        function createSearchForm(){

            var temp={

                binf:{

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

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

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

                    StationName5:$('#country').val(),                // 区/县

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

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

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

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

                },

                page:{

                        pageSize:Page.pageSize,                        //页面大小

                        pageCurr:Page.pageCurr,                        //当前页

                    pageSize:Page.pageSize,                        //页面大小

                    pageCurr:Page.pageCurr,                        //当前页

                }

           };

            return temp;

@@ -284,192 +282,108 @@
        });

    }

    

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

    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 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 = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").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++)

                {

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

    });

  	
      

        function findStationNamebyStationname1(){

            var selectvalue=$("#privince 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 = $("#city");

                    //console.info()

                    $select.text("");

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

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

                        if(i==0){

                            $option.html("全部(共"+data.sum+"种)");	
                            $option.attr("value", "");			
                        }else{

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

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

                    }

                }

            });

        }



         //当区县更新时更新机房  
        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);

                }

            }

            });

        }

			 
         //当省改变时更新市

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

                 findCity();	
         });

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

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

                 findCounty();	
         });

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

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

                 findStationNamebyStationname1(); 	
         });   	
		 
        // 根据滚动条的状态显示和隐藏返回顶部

        $(function() {

            $(document).on('scrollstop', function() {