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

81041

2018-12-24 00833231bcb04021f4a69a1b9a7e4e45f7b20f40

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

 gx_tieta/WebRoot/eleWarnPrmSet.jsp

@@ -562,6 +562,7 @@
                "dev_id":dev_id,

                "alm_id":alm_id

            };

            console.info(warmId);

            var load = layer.load(1);

            //console.log(warmId);

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


 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -146,7 +146,13 @@
                   window.location.href="control.html";     

                return ;

            }

    function getApplyYanshouIndex(t){

        var index = $(t).attr("but-index");

        console.info(index);

        setApplyYanshou(index);

    

        return ;

    }

 

    var arrTd=new Array();        //当前表格td数据

    var tblCon = $('.tbl-container');

@@ -158,7 +164,7 @@


       

    

     
       var arrdata = new Array();  
    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','通讯计数','是否验收',''];

    dataArr = [];

    var startTime = "1980-01-01";

@@ -190,15 +196,14 @@
        });

     }

     function getCookienumber(id){//输入ID，返回通讯计数。数据从缓存获取。

         //id = 0;

         if(getCookie("numberget")){

         var number = getCookie("numberget");

         number = JSON.parse(number);

         //console.info(number);

         if(number[0].dev_id){

         //console.info(number);

             if(number[0]){

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

                 if(id == number[i].dev_id){

                     return number[i].dev_commcount;

                     }

                 }

             }    

         }

@@ -227,6 +232,7 @@
        var temp = JSON.stringify(getcreatArr());

        //console.info(temp);

        arrTd = new Array();

        arrdata = new Array();

        getnumber();

         var index = 0;

         getCookienumber();

@@ -242,6 +248,7 @@
                     data=data.data

                     console.info(data);

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

                     arrdata.push(data[i].binf);//存储数据

                     arrTd[index++] = data[i].binf.StationId;

                     arrTd[index++] = data[i].binf.StationName1;

                     arrTd[index++] = data[i].binf.StationName2;

@@ -277,10 +284,12 @@
                     arrTd[index++] = data[i].binf.install_user;

                     arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);

                     arrTd[index++] = yanshou(data[i].check_en);

                     arrTd[index++]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>';

                     arrTd[index++]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>'+

                     '<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>申请验收</a>';

                     }

                 }

                 console.info(arrTd);

                 console.info(arrdata);

                 createTbl(tblCon, arrTh, arrTd);

                 timeer = window.setTimeout(function() {

                            searchBattLife();

@@ -289,13 +298,66 @@
         });            

    }

        

        function setApplyYanshou(index){

            //var value = Math.floor(34*index);

            console.info(arrdata);

            if(arrdata){

                creatYanshouObj(arrdata);

            }else{

                alert("请等待几秒后再提交申请");

            }

        }

		
        function creatYanshouObj(arrdata){

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

                var obj = {

                    binf:{

                        StationId : temp[0],    // 机房编号

                        StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]),    // 拼接机房名称

                        StationName1 :temp[1],        // 省

                        StationName2 : temp[2],        // 市

                        StationName5 : temp[3],        // 区/县

                        StationName3 : temp[4],        // 机房名称

                        StationName4 :temp[5],        // 设备名称

                        StationIp : temp[6],                //机房ip

                        FBSDeviceId : temp[7],                //设备id

                        FbsDeviceIp : temp[8],                //设备ip

                        FbsDeviceIp_YM : temp[9],            // 设备掩码

                        FbsDeviceIp_WG : temp[10],            // 网关

                        FBSDeviceName : temp[11],            //设备名称

                        GroupIndexInFBSDevice : temp[12],    //fbs设备索引

                        BattGroupId : tempid[temp[12]],                //电池组id

                        BattGroupNum : temp[14],            //机房内电池组编号

                        BattGroupName : temp[15],        //电池组索引

                        FloatVolLevel : temp[16],            //浮充电压阀值

                        OfflineVolLevel : temp[17],            //离线电压阀值

                        BattFloatCurrent : temp[18],        //浮充电流阀值

                        MonCount : temp[19],                //单体数量

                        MonCapStd : temp[20],                //标称容量

                        MonVolStd : temp[21],                //标称电压

                        MonResStd : temp[22],                //标称内阻

                        MonSerStd : temp[23],                //标称电导

                        MonVolLowToAvg : temp[24],            //单体电压次低偏移量

				
                        Load_curr : temp[25],                //负载电流

                        DisCurrMax : temp[26],                //最大核容电流

                        station_phone : temp[27],            //基站号码

										
                        BattProducer : temp[28],            //电池品牌

                        BattModel : temp[29],                //电池型号

                        BattProductDate :  temp[30]+" 00:00:00",        //电池生产日期

                        BattInUseDate :  temp[31]+" 00:00:00",            //电池使用日期

                        install_user : temp[32],            //安装人员

                    }

                }

            arr.push(obj);

            }

        }

         function setcookiedit(index){

                 var arrcookie = new Array();    

                   for(var i=0;i<33;i++){//共34项，最后一项为按钮，不必SET进数据

                       var value = Math.floor(34*index);

                       //console.info(value);

                       value = Math.floor(value+i);

                       //console.info(value);

                       arrcookie.push(arrTd[value]);

                   }

                   console.info(arrcookie);

@@ -367,30 +429,6 @@
         }

        

    // 查询内容

    /*    function searchBattLife(){

			
		
            /* 模拟数据做好就删！！！！！！！！ */

			
        /*    for(var i=0;i<340;i++){

                if(i%34==33){

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

                console.info(i);

                arrTd[i]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>';

				
                continue;

			
            }   if(i==13){

                    arrTd[i]=1002102;

                }else{

                    arrTd[i]=i*10;

                }

            }

						
            createTbl(tblCon, arrTh, arrTd);

					
            /* 模拟数据做好就删！！！！！！！！ */				
        //}



        function getUpdateArr(temp){

            var arr = new Array();


 gx_tieta/WebRoot/mobil/eleWarnPrmSet.html

@@ -25,33 +25,46 @@
<body>

    <div data-role="page">

        <div class="fg-panel">

            <form method="post" id="search_form" enctype="multipart/form-data">

            <form>

                <div class="fg-panel-header">筛选</div>

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

                    <input type="hidden" value="1" name="bmd.page.pageCurr" id="pageCurr" />

                    <input type="hidden" value="10" name="bmd.page.pageSize" id="pageSize" />

                    <label for="privince"><strong>设备</strong></label>

                    <fieldset data-role="controlgroup">

                         <p>省</p>

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

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

                          <option value="">一枢纽</option>

                          <option value="">二枢纽</option>

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

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

                    </select>

                    <!-- <select  id="privince" name="bmd.binf.StationName1" data-mini="true">

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

                        

                    </select> -->

                    <label for="city"><strong>告警名称</strong></label>

                    <select id="alarm-name">

                        <p>告警名称</p>

						
                        <select id="alarm-name"data-mini="true">

                                    <option value="0">全部</option>        <!-- 告警名称  -->

                    </select>

                    

					
					
					
                    </fieldset>

                </div>

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

                    <a href="javascript:panel.hide(true);" data-role="button" id="search" class="ui-btn ui-mini ui-btn-b ui-shadow">确定</a>

                    <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">确定</a>

                </div>

            </form>

        </div>

				
					
			
        

        

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

@@ -215,7 +228,7 @@
            });

            

            $(document).ready(function(){

                $("#search").click(function(){

                $("#submit").click(function(){

                    $('#pageCurr').val(1);

                    Page.pageCurr =1;

                    searchEquipmentName();

@@ -357,8 +370,10 @@
            

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

@@ -400,9 +415,16 @@
            var alm_id = $("#alarm-name option:selected").val();

            //console.info(dev_id);

            //console.info("1234");

            var warmId ={ "dev_id":dev_id,

			
            var warmId ={

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

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

                stationName5:$("#equipment-name").val(),

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

                          "alm_id":alm_id

            };

            console.info(warmId);

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

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

                var data=data.result;

@@ -479,6 +501,180 @@
                $('#alm_low_en').attr('checked',obj.alm_low_en==1);

            }

        }

            //页面加载时查询省

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

        data = data.result;

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

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

        };

            $.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].StationName3,

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

        </script>

    </div>