~whychwj/haha.git

parent: 8370999e | 补丁 | 提交 | ignore whitespace

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

hdw

2018-12-18 0e1721488e6d8f091d13403e20f0bbf5cf397b96

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

3个文件已修改

	gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html	144 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/batt-unapproved.html	172 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html

@@ -416,41 +416,115 @@
    //导入表格默认数据

    function installstartdata(temp){

        creatgroupid();

        document.getElementById("StationId").value = temp[0];

        document.getElementById("station_name1").value = temp[1];

        document.getElementById("city").value = temp[2];            //市

        document.getElementById("county").value = temp[3];            //区县

        document.getElementById("StationName3").value = temp[4];   //机房名称

        document.getElementById("StationName4").value = temp[5];    //设备名称

        document.getElementById("StationIp").value = temp[6];        //设备IP

        //document.getElementById("FBSDeviceId").value = dev_id;	
        document.getElementById("FbsDeviceIp").value = temp[8];

        document.getElementById("FbsDeviceIp_YM").value = temp[9];

        document.getElementById("FbsDeviceIp_WG").value = temp[10];

        document.getElementById("FBSDeviceName").value = temp[11];

        //document.getElementById("GroupIndexInFBSDevice").value = temp[12];

        document.getElementById("BattGroupId").value = temp[13];

        document.getElementById("BattGroupNum").value = suoyin;

        //document.getElementById("BattGroupName").value = temp[15];

        document.getElementById("FloatVolLevel").value = temp[16];

        document.getElementById("OfflineVolLevel").value = temp[17];

        document.getElementById("BattFloatCurrent").value = temp[18];

        document.getElementById("MonCount").value = temp[19];

        document.getElementById("MonCapStd").value = temp[20];

        document.getElementById("MonVolStd").value = temp[21];

        document.getElementById("MonResStd").value = temp[22];

        document.getElementById("MonSerStd").value = temp[23];

        document.getElementById("MonVolLowToAvg").value = temp[24];

        document.getElementById("Load_curr").value = temp[25];

        document.getElementById("DisCurrMax").value = temp[26];

        document.getElementById("station_phone").value = temp[27];

        document.getElementById("BattProducer").value = temp[28];

        document.getElementById("BattModel").value = temp[29];

        //document.getElementById("startTestrecord").value = temp[30];

        //document.getElementById("endTestrecord").value = temp[31];

        setTimes($("#startTestrecord"),temp[30]);

        setTimes($("#endTestrecord"),temp[31]);

        document.getElementById("install_user").value = temp[32];

        var data = {

                StationId: '4011100'

                ,StationName1: '广西省'

                ,StationName2: '白色市'

                ,StationName5: '乐业县'

                ,StationName3: 'GX百色乐业县立新小区WF'

                ,StationName4: 'BTS设备'

                ,StationIp: '192.168.0.1'

                ,FBSDeviceId: '960000111'

                ,FbsDeviceIp: '127.0.0.1'

                ,FbsDeviceIp_YM: '255.255.255.0'

                ,FbsDeviceIp_WG: '127.0.0.1'

                ,FBSDeviceName: '设备名称'

                ,GroupIndexInFBSDevice: 1 
                ,BattGroupId: 1000005

                ,BattGroupNum: 2

                ,BattGroupName: '电池组1'

                ,FloatVolLevel: 54

                ,OfflineVolLevel: 42.9 
                ,BattFloatCurrent: 10

                ,MonCount: 24

                ,MonCapStd: 300

                ,MonVolStd: 2

                ,MonResStd: 0.2

                ,MonSerStd: 5000

                ,MonVolLowToAvg: 0.05 
                ,Load_curr: 15

                ,DisCurrMax: '0'

                ,station_phone: 12345678912

                ,BattProducer: '升阳'

                ,BattModel: ''

                ,productDate: '2018-09-18 00:00:00'

                ,useDate: '2018-09-18 00:00:00'

                ,install_user: '呵呵'

            };

            console.info(data.StationId);

        if(temp.length>0){

            document.getElementById("StationId").value = data.StationId;

    //        document.getElementById("station_name1").value = data.StationName1;

    //        document.getElementById("city").value = data.StationName2;            //市

    //        document.getElementById("county").value = data.StationName5;            //区县

    //        document.getElementById("StationName3").value = data.StationName3;   //机房名称

    //        document.getElementById("StationName4").value = data.StationName4;    //设备名称

            document.getElementById("StationIp").value = data.StationIp;        //设备IP

            //document.getElementById("FBSDeviceId").value = dev_id;	
            document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;

            document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;

            document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;

    //        document.getElementById("FBSDeviceName").value = data.FBSDeviceName;

            //document.getElementById("GroupIndexInFBSDevice").value = temp[12];

            document.getElementById("BattGroupId").value = data.BattGroupId;

            document.getElementById("BattGroupNum").value = data.BattGroupNum;

            //document.getElementById("BattGroupName").value = temp[15];

    //        document.getElementById("FloatVolLevel").value = data.FloatVolLevel;

    //        document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;

    //        document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;

    //        document.getElementById("MonCount").value = data.MonCount;

    //        document.getElementById("MonCapStd").value = data.MonCapStd;

    //        document.getElementById("MonVolStd").value = data.MonVolStd;

    //        document.getElementById("MonResStd").value = data.MonResStd;

    //        document.getElementById("MonSerStd").value = data.MonSerStd;

    //        document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;

    //        document.getElementById("Load_curr").value = data.Load_curr;

    //        document.getElementById("DisCurrMax").value = data.DisCurrMax;

    //        document.getElementById("station_phone").value = data.station_phone;

    //        document.getElementById("BattProducer").value = data.BattProducer;

            document.getElementById("BattModel").value = data.BattModel;

            //document.getElementById("startTestrecord").value = temp[30];

            //document.getElementById("endTestrecord").value = temp[31];

            setTimes($("#startTestrecord"),data.productDate);

            setTimes($("#endTestrecord"),data.useDate);

    //        document.getElementById("install_user").value = data.install_user;			
        }else{

            document.getElementById("StationId").value = temp[0];

            document.getElementById("station_name1").value = temp[1];

            document.getElementById("city").value = temp[2];            //市

            document.getElementById("county").value = temp[3];            //区县

            document.getElementById("StationName3").value = temp[4];   //机房名称

            document.getElementById("StationName4").value = temp[5];    //设备名称

            document.getElementById("StationIp").value = temp[6];        //设备IP

            //document.getElementById("FBSDeviceId").value = dev_id;	
            document.getElementById("FbsDeviceIp").value = temp[8];

            document.getElementById("FbsDeviceIp_YM").value = temp[9];

            document.getElementById("FbsDeviceIp_WG").value = temp[10];

            document.getElementById("FBSDeviceName").value = temp[11];

            //document.getElementById("GroupIndexInFBSDevice").value = temp[12];

            document.getElementById("BattGroupId").value = temp[13];

            document.getElementById("BattGroupNum").value = suoyin;

            //document.getElementById("BattGroupName").value = temp[15];

            document.getElementById("FloatVolLevel").value = temp[16];

            document.getElementById("OfflineVolLevel").value = temp[17];

            document.getElementById("BattFloatCurrent").value = temp[18];

            document.getElementById("MonCount").value = temp[19];

            document.getElementById("MonCapStd").value = temp[20];

            document.getElementById("MonVolStd").value = temp[21];

            document.getElementById("MonResStd").value = temp[22];

            document.getElementById("MonSerStd").value = temp[23];

            document.getElementById("MonVolLowToAvg").value = temp[24];

            document.getElementById("Load_curr").value = temp[25];

            document.getElementById("DisCurrMax").value = temp[26];

            document.getElementById("station_phone").value = temp[27];

            document.getElementById("BattProducer").value = temp[28];

            document.getElementById("BattModel").value = temp[29];

            //document.getElementById("startTestrecord").value = temp[30];

            //document.getElementById("endTestrecord").value = temp[31];

            setTimes($("#startTestrecord"),temp[30]);

            setTimes($("#endTestrecord"),temp[31]);

            document.getElementById("install_user").value = temp[32];

        }

        setFloatAndoutLine();

    }

    


 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html

@@ -84,7 +84,7 @@
                   

                   

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

                          <option value="0">新建电池组</option>

                          <option value=0>新建电池组</option>

                          

                        </select>

                        

@@ -363,7 +363,7 @@
    tempindex = JSON.parse(tempindex);

    tempnum =JSON.parse(tempnum);

    var suoyin = temp[33];

	
    var addbattnum = tempindex.length;

   $(function(){

   creatAllView(tempindex.length).trigger('create');

   creatBa(tempindex.length).trigger('create');

@@ -430,15 +430,14 @@
    // 格式化提交后台信息的对象数组修改

    function getUpdateArr(){

            var arr = new Array();

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

            console.info(addbattnum);

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

                var battString = "#battname"+i;

                var index = String(i);

                console.info(battString);

                var obj = {

                    apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                    num : tempnum[i],

					
                    binf:{

                        StationId : $("#StationId").val(),    // 机房编号

                        StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()),    // 拼接机房名称

@@ -523,15 +522,37 @@
   }

 

 

 
 
 
 
    function creatBattGroupId(addbattnum){

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

                data:null,	
                success: function(data){

                    data=JSON.parse(data);

                    data=data.result;

                    data =JSON.parse(data);

                    //console.info(data)

                    var groupid = data.data;

                    //console.info(groupid);

                    //tempgroupid.push(groupid);

                    console.info(tempgroupid);

                    for(var i=tempgroupid.length;i<addbattnum;i++){

                        tempgroupid.push(groupid++);

                        console.info(tempgroupid);

                    }

                }

        });	
    }



 

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

    var addbattnum=$('#newbattnum').val()+tempindex.length;

    console.warn(addbattnum+'hihihi');

       creatAllView(3).trigger('create');

        var numbattnum = parseInt($('#newbattnum').val());

        var index =parseInt(tempindex.length);

        addbattnum=Math.floor((numbattnum)+(tempindex.length));

        console.warn(addbattnum);

        creatAllView(addbattnum).trigger('create');

        creatBattGroupId(addbattnum);

   });

 



@@ -542,4 +563,4 @@
   $('#changeErr').popup('open'); */

   </script>

   

</html> 
</html>


 gx_tieta/WebRoot/mobil/batt-unapproved.html

@@ -130,7 +130,7 @@
        </div>  

        <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">

        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>

        <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >确定删除</a>	  
        <a href="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >确定删除</a>	  
        <a href="" id="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">取消删除</a>

        </div>    

        

@@ -148,11 +148,15 @@


 <script type="text/javascript">

        /* 获取点击的是哪个按钮   */

        
    function getDeleteButIndex(t){

        console.warn($(t).attr("but-index")+' 删除');

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

        console.info(index); 
           setcookiedit(index);

        //delindex = index; 
         $("#delete").attr("value",index);

        //setCookie("delindex",index);

           //setcookiedit(index);

           //delparm = battDeleteparm(index);

           //var parm = battDeleteparm();

        //console.info(parm);

        //delBatt(parm);

@@ -166,7 +170,7 @@
        return ;

    }

    

 
     var delindex=0;

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

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

    var Page = {

@@ -174,17 +178,11 @@
        pageCurr:1,                  //当前页码数

        pageAll:0,

    };



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

        //searchHomeInfoByName(homename);

        //window.location.href="batt-infor-unapproved-edit.html";   
    });

    $("#delete").click(function(){  //删除电池组

        var parm = battDeleteparm();

        console.info(parm);

        delBatt(parm);

        //window.location.href="batt-unapproved.html";   
    $("#delete").click(function(delindex){  //删除电池组

        var delindex = $("#delete").val();

        //console.info($("#delete").val());

        //console.info(delindex);

           battDeleteparm(delindex);   
    });

     

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

@@ -274,6 +272,7 @@
                    //var index = 0;

                    var num =new Array();

                    var groupId = new Array();

                    var eleditparm = new Array();

                    //var index1 = 0;

                    var temp = {

                        binf:{

@@ -294,26 +293,37 @@
                        success: function(data){

                            var data = JSON.parse(data.result)

                            console.info(data);

                            data = data.data;

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

                            console.info(data[i]);

                             groupName[i] = data[i].binf.BattGroupName;

                             num[i] = data[i].num;

                             groupId[i] = data[i].binf.BattGroupId;

                            }

				        	
                            if(data.code!=0){

                                data = data.data;

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

                                    console.info(data[i]);

                                    groupName[i] = data[i].binf.BattGroupName;

                                    num[i] = data[i].num;

                                    groupId[i] = data[i].binf.BattGroupId;

                                    var eleditparmarr={

                                        groupname : data[i].binf.BattGroupName,

                                        num : data[i].num,

                                        groupId :data[i].binf.BattGroupId,

                                    }

                                    eleditparm.push(eleditparmarr);	
                                }

                                 console.info(eleditparm);				        		
                            }				      				        	
                        var json = JSON.stringify(groupName);

                        var json1 =JSON.stringify(num);

                        var json2 = JSON.stringify(groupId);    
                        var json2 = JSON.stringify(groupId);

				        
                        //console.info(eleditparm)

                        var jsonedit = JSON.stringify(eleditparm);

                        setCookie("eleditparm",jsonedit);			   
                        setCookie("eleparmindex",json);             //电池组名称

                        setCookie("eleparmnum",json1);                //电池组编号

                        console.info(groupName);

                        setCookie("elegroupid",json2);

                        console.info(json2)

                        console.info(json2);

                        window.location.href="batt-infor-unapproved-edit.html";    

                        }

                    })

				    
                    });	    
        }                        

    function setcookiedit(index){

                 var arrcookie = new Array();    

@@ -354,19 +364,25 @@
                    window.location.href="batt-unapproved.html"; 

                }

            }

        }); 
 		
        }); 	
     }    

    function battDeleteparm(){

        var arr = new Array();

    function battDeleteparm(index){

        console.info(arrTh.length);

        console.info(index);

        var delindex = Math.ceil(arrTh.length*index);

        var stationid = arrTd[delindex];

        console.info(stationid);

        searchdelnum(stationid,index,delindex);

        /*var arr = new Array();

        var temp = getCookie("eleparm");

         var tempindex = getCookie("eleparmindex");

        var tempnum = getCookie("eleparmnum");

        var tempgroupid = getCookie("elegroupid");

        temp=JSON.parse(temp);

        tempindex = JSON.parse(tempindex);

        tempnum =JSON.parse(tempnum);

        //console.info(temp);

        //var numinsert;

        tempid = JSON.parse(tempgroupid);

		
        console.info(temp[12]);

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

            //console.info(battString);

@@ -388,7 +404,7 @@
                    FbsDeviceIp_WG : temp[10],            // 网关

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

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

                    BattGroupId : temp[13],                //电池组id

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

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

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

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

@@ -415,10 +431,93 @@
            arr.push(obj);

        //}

        //console.info(arr);

        return arr;

        return arr;*/

        

    }

    

    function searchdelnum(id,index,delindex) {

                    var groupName = new Array();

                    //var index = 0;

                    var num =new Array();

                    var groupId = new Array();

                    //var index1 = 0;

                    var temp = {

                        binf:{

                            StationId:id,						
                        }

                        ,page: {

                            pageCurr: 1

                            ,pageSize: 100

                        }

                    };	
                    // 请求后台

                    $.ajax({

                        type: "post", 				
                        url: "Battinf_applyAction!serchbystationId",				
                        async:true,				
                        dataType:'json',

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

                            var data = JSON.parse(data.result)

                            console.info(data);

                            if(data.code!=0){

                            data = data.data;

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

                                console.info(data[i]);

                                 groupName[i] = data[i].binf.BattGroupName;

                                 num[i] = data[i].num;

                                 groupId[i] = data[i].binf.BattGroupId;

                            }

                            var arr = new Array();

                            var obj = {

                                //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                                num : num[arrTd[delindex+12]],

                                binf:{

                                    StationId : arrTd[delindex++],    // 机房编号

                                    StationName : (arrTd[delindex]+"-"+arrTd[delindex+1]+"-"+arrTd[delindex+3]+"-"+arrTd[delindex+4]),    // 拼接机房名称

                                    StationName1 :arrTd[delindex++],        // 省

                                    StationName2 : arrTd[delindex++],        // 市

                                    StationName5 : arrTd[delindex++],        // 区/县

                                    StationName3 : arrTd[delindex++],        // 机房名称

                                    StationName4 :arrTd[delindex++],        // 设备名称

                                    StationIp : arrTd[delindex++],                //机房ip

                                    FBSDeviceId : arrTd[delindex++],                //设备id

                                    FbsDeviceIp : arrTd[delindex++],                //设备ip

                                    FbsDeviceIp_YM : arrTd[delindex++],            // 设备掩码

                                    FbsDeviceIp_WG : arrTd[delindex++],            // 网关

                                    FBSDeviceName : arrTd[delindex++],            //设备名称

                                    GroupIndexInFBSDevice : arrTd[delindex++],    //fbs设备索引

                                    BattGroupId : arrTd[delindex++],                //电池组id

                                    BattGroupNum : arrTd[delindex++],            //机房内电池组编号

                                    BattGroupName : arrTd[delindex++],        //电池组索引

                                    FloatVolLevel : arrTd[delindex++],            //浮充电压阀值

                                    OfflineVolLevel : arrTd[delindex++],            //离线电压阀值

                                    BattFloatCurrent : arrTd[delindex++],        //浮充电流阀值

                                    MonCount : arrTd[delindex++],                //单体数量

                                    MonCapStd : arrTd[delindex++],                //标称容量

                                    MonVolStd : arrTd[delindex++],                //标称电压

                                    MonResStd : arrTd[delindex++],                //标称内阻

                                    MonSerStd : arrTd[delindex++],                //标称电导

                                    MonVolLowToAvg : arrTd[delindex++],            //单体电压次低偏移量

							
                                    Load_curr : arrTd[delindex++],                //负载电流

                                    DisCurrMax : arrTd[delindex++],                //最大核容电流

                                    station_phone : arrTd[delindex++],            //基站号码

													
                                    BattProducer : arrTd[delindex++],            //电池品牌

                                    BattModel : arrTd[delindex++],                //电池型号

                                    BattProductDate :  arrTd[delindex++]+" 00:00:00",        //电池生产日期

                                    BattInUseDate :  arrTd[delindex++]+" 00:00:00",            //电池使用日期

                                    install_user : arrTd[delindex++],            //安装人员

                                }

                            }

                            arr.push(obj);

                            console.info(arr);

                            delBatt(arr);

                        }

                        }

                    })	    
        }		
    $(function() {

        //点击上一页

        $('.pre-page').on('click', 'a', function() {

@@ -461,6 +560,7 @@
        }else{

            $('.pre-page').show();

        }



        var pageNum = Math.ceil(Page.pageAll/Page.pageSize);

        

        if(Page.pageCurr < pageNum){

@@ -473,4 +573,4 @@
    

     

   </script>

</html> 
</html>

			@@ -416,41 +416,115 @@
			//导入表格默认数据
			function installstartdata(temp){
			creatgroupid();
			document.getElementById("StationId").value = temp[0];
			document.getElementById("station_name1").value = temp[1];
			document.getElementById("city").value = temp[2]; //市
			document.getElementById("county").value = temp[3]; //区县
			document.getElementById("StationName3").value = temp[4]; //机房名称
			document.getElementById("StationName4").value = temp[5]; //设备名称
			document.getElementById("StationIp").value = temp[6]; //设备IP
			//document.getElementById("FBSDeviceId").value = dev_id;
			document.getElementById("FbsDeviceIp").value = temp[8];
			document.getElementById("FbsDeviceIp_YM").value = temp[9];
			document.getElementById("FbsDeviceIp_WG").value = temp[10];
			document.getElementById("FBSDeviceName").value = temp[11];
			//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
			document.getElementById("BattGroupId").value = temp[13];
			document.getElementById("BattGroupNum").value = suoyin;
			//document.getElementById("BattGroupName").value = temp[15];
			document.getElementById("FloatVolLevel").value = temp[16];
			document.getElementById("OfflineVolLevel").value = temp[17];
			document.getElementById("BattFloatCurrent").value = temp[18];
			document.getElementById("MonCount").value = temp[19];
			document.getElementById("MonCapStd").value = temp[20];
			document.getElementById("MonVolStd").value = temp[21];
			document.getElementById("MonResStd").value = temp[22];
			document.getElementById("MonSerStd").value = temp[23];
			document.getElementById("MonVolLowToAvg").value = temp[24];
			document.getElementById("Load_curr").value = temp[25];
			document.getElementById("DisCurrMax").value = temp[26];
			document.getElementById("station_phone").value = temp[27];
			document.getElementById("BattProducer").value = temp[28];
			document.getElementById("BattModel").value = temp[29];
			//document.getElementById("startTestrecord").value = temp[30];
			//document.getElementById("endTestrecord").value = temp[31];
			setTimes($("#startTestrecord"),temp[30]);
			setTimes($("#endTestrecord"),temp[31]);
			document.getElementById("install_user").value = temp[32];
			var data = {
			StationId: '4011100'
			,StationName1: '广西省'
			,StationName2: '白色市'
			,StationName5: '乐业县'
			,StationName3: 'GX百色乐业县立新小区WF'
			,StationName4: 'BTS设备'
			,StationIp: '192.168.0.1'
			,FBSDeviceId: '960000111'
			,FbsDeviceIp: '127.0.0.1'
			,FbsDeviceIp_YM: '255.255.255.0'
			,FbsDeviceIp_WG: '127.0.0.1'
			,FBSDeviceName: '设备名称'
			,GroupIndexInFBSDevice: 1
			,BattGroupId: 1000005
			,BattGroupNum: 2
			,BattGroupName: '电池组1'
			,FloatVolLevel: 54
			,OfflineVolLevel: 42.9
			,BattFloatCurrent: 10
			,MonCount: 24
			,MonCapStd: 300
			,MonVolStd: 2
			,MonResStd: 0.2
			,MonSerStd: 5000
			,MonVolLowToAvg: 0.05
			,Load_curr: 15
			,DisCurrMax: '0'
			,station_phone: 12345678912
			,BattProducer: '升阳'
			,BattModel: ''
			,productDate: '2018-09-18 00:00:00'
			,useDate: '2018-09-18 00:00:00'
			,install_user: '呵呵'
			};
			console.info(data.StationId);
			if(temp.length>0){
			document.getElementById("StationId").value = data.StationId;
			// document.getElementById("station_name1").value = data.StationName1;
			// document.getElementById("city").value = data.StationName2; //市
			// document.getElementById("county").value = data.StationName5; //区县
			// document.getElementById("StationName3").value = data.StationName3; //机房名称
			// document.getElementById("StationName4").value = data.StationName4; //设备名称
			document.getElementById("StationIp").value = data.StationIp; //设备IP
			//document.getElementById("FBSDeviceId").value = dev_id;
			document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
			document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
			document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
			// document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
			//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
			document.getElementById("BattGroupId").value = data.BattGroupId;
			document.getElementById("BattGroupNum").value = data.BattGroupNum;
			//document.getElementById("BattGroupName").value = temp[15];
			// document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
			// document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
			// document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
			// document.getElementById("MonCount").value = data.MonCount;
			// document.getElementById("MonCapStd").value = data.MonCapStd;
			// document.getElementById("MonVolStd").value = data.MonVolStd;
			// document.getElementById("MonResStd").value = data.MonResStd;
			// document.getElementById("MonSerStd").value = data.MonSerStd;
			// document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
			// document.getElementById("Load_curr").value = data.Load_curr;
			// document.getElementById("DisCurrMax").value = data.DisCurrMax;
			// document.getElementById("station_phone").value = data.station_phone;
			// document.getElementById("BattProducer").value = data.BattProducer;
			document.getElementById("BattModel").value = data.BattModel;
			//document.getElementById("startTestrecord").value = temp[30];
			//document.getElementById("endTestrecord").value = temp[31];
			setTimes($("#startTestrecord"),data.productDate);
			setTimes($("#endTestrecord"),data.useDate);
			// document.getElementById("install_user").value = data.install_user;
			}else{
			document.getElementById("StationId").value = temp[0];
			document.getElementById("station_name1").value = temp[1];
			document.getElementById("city").value = temp[2]; //市
			document.getElementById("county").value = temp[3]; //区县
			document.getElementById("StationName3").value = temp[4]; //机房名称
			document.getElementById("StationName4").value = temp[5]; //设备名称
			document.getElementById("StationIp").value = temp[6]; //设备IP
			//document.getElementById("FBSDeviceId").value = dev_id;
			document.getElementById("FbsDeviceIp").value = temp[8];
			document.getElementById("FbsDeviceIp_YM").value = temp[9];
			document.getElementById("FbsDeviceIp_WG").value = temp[10];
			document.getElementById("FBSDeviceName").value = temp[11];
			//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
			document.getElementById("BattGroupId").value = temp[13];
			document.getElementById("BattGroupNum").value = suoyin;
			//document.getElementById("BattGroupName").value = temp[15];
			document.getElementById("FloatVolLevel").value = temp[16];
			document.getElementById("OfflineVolLevel").value = temp[17];
			document.getElementById("BattFloatCurrent").value = temp[18];
			document.getElementById("MonCount").value = temp[19];
			document.getElementById("MonCapStd").value = temp[20];
			document.getElementById("MonVolStd").value = temp[21];
			document.getElementById("MonResStd").value = temp[22];
			document.getElementById("MonSerStd").value = temp[23];
			document.getElementById("MonVolLowToAvg").value = temp[24];
			document.getElementById("Load_curr").value = temp[25];
			document.getElementById("DisCurrMax").value = temp[26];
			document.getElementById("station_phone").value = temp[27];
			document.getElementById("BattProducer").value = temp[28];
			document.getElementById("BattModel").value = temp[29];
			//document.getElementById("startTestrecord").value = temp[30];
			//document.getElementById("endTestrecord").value = temp[31];
			setTimes($("#startTestrecord"),temp[30]);
			setTimes($("#endTestrecord"),temp[31]);
			document.getElementById("install_user").value = temp[32];
			}
			setFloatAndoutLine();
			}

			@@ -84,7 +84,7 @@


			<select id="newbattnum" data-mini="true">
			<option value="0">新建电池组</option>
			<option value=0>新建电池组</option>

			</select>

			@@ -363,7 +363,7 @@
			tempindex = JSON.parse(tempindex);
			tempnum =JSON.parse(tempnum);
			var suoyin = temp[33];

			var addbattnum = tempindex.length;
			$(function(){
			creatAllView(tempindex.length).trigger('create');
			creatBa(tempindex.length).trigger('create');
			@@ -430,15 +430,14 @@
			// 格式化提交后台信息的对象数组修改
			function getUpdateArr(){
			var arr = new Array();

			for(var i=0;i<tempindex.length;i++){
			console.info(addbattnum);
			for(var i=0;i<addbattnum;i++){
			var battString = "#battname"+i;
			var index = String(i);
			console.info(battString);
			var obj = {
			apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
			num : tempnum[i],

			binf:{
			StationId : $("#StationId").val(), // 机房编号
			StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()), // 拼接机房名称
			@@ -523,15 +522,37 @@
			}






			function creatBattGroupId(addbattnum){
			$.ajax({type: "post",
			url: "BattInfAction!searchMaxBattgroupId",
			async:true,
			dataType:'text',
			data:null,
			success: function(data){
			data=JSON.parse(data);
			data=data.result;
			data =JSON.parse(data);
			//console.info(data)
			var groupid = data.data;
			//console.info(groupid);
			//tempgroupid.push(groupid);
			console.info(tempgroupid);
			for(var i=tempgroupid.length;i<addbattnum;i++){
			tempgroupid.push(groupid++);
			console.info(tempgroupid);
			}
			}
			});
			}


			$('#newbattnum').change(function(){
			var addbattnum=$('#newbattnum').val()+tempindex.length;
			console.warn(addbattnum+'hihihi');
			creatAllView(3).trigger('create');
			var numbattnum = parseInt($('#newbattnum').val());
			var index =parseInt(tempindex.length);
			addbattnum=Math.floor((numbattnum)+(tempindex.length));
			console.warn(addbattnum);
			creatAllView(addbattnum).trigger('create');
			creatBattGroupId(addbattnum);
			});


			@@ -542,4 +563,4 @@
			$('#changeErr').popup('open'); */
			</script>

			</html>
			</html>

			@@ -130,7 +130,7 @@
			</div>
			<div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
			<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>
			<a href="" id="delete" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >确定删除</a>
			<a href="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >确定删除</a>
			<a href="" id="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">取消删除</a>
			</div>

			@@ -148,11 +148,15 @@

			<script type="text/javascript">
			/* 获取点击的是哪个按钮 */

			function getDeleteButIndex(t){
			console.warn($(t).attr("but-index")+' 删除');
			var index = $(t).attr("but-index");
			console.info(index);
			setcookiedit(index);
			//delindex = index;
			$("#delete").attr("value",index);
			//setCookie("delindex",index);
			//setcookiedit(index);
			//delparm = battDeleteparm(index);
			//var parm = battDeleteparm();
			//console.info(parm);
			//delBatt(parm);
			@@ -166,7 +170,7 @@
			return ;
			}


			var delindex=0;
			var arrTd=new Array(); //当前表格td数据
			var tblCon = $('.tbl-container');
			var Page = {
			@@ -174,17 +178,11 @@
			pageCurr:1, //当前页码数
			pageAll:0,
			};


			$("#edit").click(function(){
			//searchHomeInfoByName(homename);
			//window.location.href="batt-infor-unapproved-edit.html";
			});
			$("#delete").click(function(){ //删除电池组
			var parm = battDeleteparm();
			console.info(parm);
			delBatt(parm);
			//window.location.href="batt-unapproved.html";
			$("#delete").click(function(delindex){ //删除电池组
			var delindex = $("#delete").val();
			//console.info($("#delete").val());
			//console.info(delindex);
			battDeleteparm(delindex);
			});

			var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员',''];
			@@ -274,6 +272,7 @@
			//var index = 0;
			var num =new Array();
			var groupId = new Array();
			var eleditparm = new Array();
			//var index1 = 0;
			var temp = {
			binf:{
			@@ -294,26 +293,37 @@
			success: function(data){
			var data = JSON.parse(data.result)
			console.info(data);
			data = data.data;
			for(var i=0;i<data.length;i++){
			console.info(data[i]);
			groupName[i] = data[i].binf.BattGroupName;
			num[i] = data[i].num;
			groupId[i] = data[i].binf.BattGroupId;
			}

			if(data.code!=0){
			data = data.data;
			for(var i=0;i<data.length;i++){
			console.info(data[i]);
			groupName[i] = data[i].binf.BattGroupName;
			num[i] = data[i].num;
			groupId[i] = data[i].binf.BattGroupId;
			var eleditparmarr={
			groupname : data[i].binf.BattGroupName,
			num : data[i].num,
			groupId :data[i].binf.BattGroupId,
			}
			eleditparm.push(eleditparmarr);
			}
			console.info(eleditparm);
			}
			var json = JSON.stringify(groupName);
			var json1 =JSON.stringify(num);
			var json2 = JSON.stringify(groupId);
			var json2 = JSON.stringify(groupId);

			//console.info(eleditparm)
			var jsonedit = JSON.stringify(eleditparm);
			setCookie("eleditparm",jsonedit);
			setCookie("eleparmindex",json); //电池组名称
			setCookie("eleparmnum",json1); //电池组编号
			console.info(groupName);
			setCookie("elegroupid",json2);
			console.info(json2)
			console.info(json2);
			window.location.href="batt-infor-unapproved-edit.html";
			}
			})

			});
			}
			function setcookiedit(index){
			var arrcookie = new Array();
			@@ -354,19 +364,25 @@
			window.location.href="batt-unapproved.html";
			}
			}
			});

			});
			}
			function battDeleteparm(){
			var arr = new Array();
			function battDeleteparm(index){
			console.info(arrTh.length);
			console.info(index);
			var delindex = Math.ceil(arrTh.length*index);
			var stationid = arrTd[delindex];
			console.info(stationid);
			searchdelnum(stationid,index,delindex);
			/*var arr = new Array();
			var temp = getCookie("eleparm");
			var tempindex = getCookie("eleparmindex");
			var tempnum = getCookie("eleparmnum");
			var tempgroupid = getCookie("elegroupid");
			temp=JSON.parse(temp);
			tempindex = JSON.parse(tempindex);
			tempnum =JSON.parse(tempnum);
			//console.info(temp);
			//var numinsert;
			tempid = JSON.parse(tempgroupid);

			console.info(temp[12]);
			//for(var i=0;i<tempindex.length;i++){
			//console.info(battString);
			@@ -388,7 +404,7 @@
			FbsDeviceIp_WG : temp[10], // 网关
			FBSDeviceName : temp[11], //设备名称
			GroupIndexInFBSDevice : temp[12], //fbs设备索引
			BattGroupId : temp[13], //电池组id
			BattGroupId : tempid[temp[12]], //电池组id
			BattGroupNum : temp[14], //机房内电池组编号
			BattGroupName : temp[15], //电池组索引
			FloatVolLevel : temp[16], //浮充电压阀值
			@@ -415,10 +431,93 @@
			arr.push(obj);
			//}
			//console.info(arr);
			return arr;
			return arr;*/

			}

			function searchdelnum(id,index,delindex) {
			var groupName = new Array();
			//var index = 0;
			var num =new Array();
			var groupId = new Array();
			//var index1 = 0;
			var temp = {
			binf:{
			StationId:id,
			}
			,page: {
			pageCurr: 1
			,pageSize: 100
			}
			};
			// 请求后台
			$.ajax({
			type: "post",
			url: "Battinf_applyAction!serchbystationId",
			async:true,
			dataType:'json',
			data:"json="+JSON.stringify(temp),
			success: function(data){
			var data = JSON.parse(data.result)
			console.info(data);
			if(data.code!=0){
			data = data.data;
			for(var i=0;i<data.length;i++){
			console.info(data[i]);
			groupName[i] = data[i].binf.BattGroupName;
			num[i] = data[i].num;
			groupId[i] = data[i].binf.BattGroupId;
			}
			var arr = new Array();
			var obj = {
			//apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
			num : num[arrTd[delindex+12]],
			binf:{
			StationId : arrTd[delindex++], // 机房编号
			StationName : (arrTd[delindex]+"-"+arrTd[delindex+1]+"-"+arrTd[delindex+3]+"-"+arrTd[delindex+4]), // 拼接机房名称
			StationName1 :arrTd[delindex++], // 省
			StationName2 : arrTd[delindex++], // 市
			StationName5 : arrTd[delindex++], // 区/县
			StationName3 : arrTd[delindex++], // 机房名称
			StationName4 :arrTd[delindex++], // 设备名称
			StationIp : arrTd[delindex++], //机房ip
			FBSDeviceId : arrTd[delindex++], //设备id
			FbsDeviceIp : arrTd[delindex++], //设备ip
			FbsDeviceIp_YM : arrTd[delindex++], // 设备掩码
			FbsDeviceIp_WG : arrTd[delindex++], // 网关
			FBSDeviceName : arrTd[delindex++], //设备名称
			GroupIndexInFBSDevice : arrTd[delindex++], //fbs设备索引
			BattGroupId : arrTd[delindex++], //电池组id
			BattGroupNum : arrTd[delindex++], //机房内电池组编号
			BattGroupName : arrTd[delindex++], //电池组索引
			FloatVolLevel : arrTd[delindex++], //浮充电压阀值
			OfflineVolLevel : arrTd[delindex++], //离线电压阀值
			BattFloatCurrent : arrTd[delindex++], //浮充电流阀值
			MonCount : arrTd[delindex++], //单体数量
			MonCapStd : arrTd[delindex++], //标称容量
			MonVolStd : arrTd[delindex++], //标称电压
			MonResStd : arrTd[delindex++], //标称内阻
			MonSerStd : arrTd[delindex++], //标称电导
			MonVolLowToAvg : arrTd[delindex++], //单体电压次低偏移量

			Load_curr : arrTd[delindex++], //负载电流
			DisCurrMax : arrTd[delindex++], //最大核容电流
			station_phone : arrTd[delindex++], //基站号码

			BattProducer : arrTd[delindex++], //电池品牌
			BattModel : arrTd[delindex++], //电池型号
			BattProductDate : arrTd[delindex++]+" 00:00:00", //电池生产日期
			BattInUseDate : arrTd[delindex++]+" 00:00:00", //电池使用日期
			install_user : arrTd[delindex++], //安装人员
			}
			}
			arr.push(obj);
			console.info(arr);
			delBatt(arr);
			}
			}
			})
			}
			$(function() {
			//点击上一页
			$('.pre-page').on('click', 'a', function() {
			@@ -461,6 +560,7 @@
			}else{
			$('.pre-page').show();
			}

			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);

			if(Page.pageCurr < pageNum){
			@@ -473,4 +573,4 @@


			</script>
			</html>
			</html>