修改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-08 e5e64cb7354ce4e9f4ef02057789a9ea0f85eb56

修改

 gx_tieta/WebRoot/mobil/approvalBatt-index.html

File was deleted

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

@@ -286,12 +286,15 @@
    //console.info(temp);

    temp=JSON.parse(temp);

    console.info(temp);

    console.info(temp[30]);

    console.info(temp[33]);

    console.info(temp[34]);

    var suoyin = temp[33];

    var fuchongfazhi = [0,0,0,0];

    var lixiandianyafazhi = [0,0,0,0];

    //console.info(temp[30]);

    //console.info(temp[33]);

    //console.info(temp[34]);

    var suoyin = temp[33];//电池组个数

    var Page = {

        pageSize:20,                 //每页的行数

        pageCurr:1,                  //当前页码数

        pageAll:0,

    };

   $(function(){

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

   creatMonCapOpt(suoyin);

@@ -686,7 +689,8 @@
                if(data.code!=1){

                    addBattnew()

                }else{

                    alert("该机房已存在，请返回上一页搜索框修改");

                    alert("该机房已存在，请返回修改页面修改并重新提交");

                    SearchParam();

                }

            }

        });

@@ -716,8 +720,127 @@
         });

     }

   

   function SearchParam(){

            var temp = {							
                page:Page,

                binf:{

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

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

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

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

            };

            console.info(temp);

            searchBattLife(temp);		
        }	
    // 查询内容

    function searchBattLife(temp){

        //var temp = createSearchParam();

        var json = JSON.stringify(temp);

        var num =new Array();

        var groupId = new Array();

        var groupName = new Array();

        var arrdata = new Array();

        console.info(json);

        arrTd = new Array();

        var load;

         $.ajax({

            type:"post",

            url:"BattInfAction!searchInform",

            async:true,

            datatype:'text',

            data:"json="+json,

            success:function(data){

                console.info(data);

                var data = JSON.parse(data.result);					
                //layer.close(load);

                console.info(data);

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

                    data=data.data;

                    var index = 0;

                    var ArryTb= new Array();

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

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

                    }

                seteditparm(0,arrdata);

                window.location.href="batt-edit2.html";	 
                }else{

                    Page.pageAll = 0;

                }	
                //createTbl(tblCon, arrTh, arrTd);	
                //getEditButIndex(0);		
            }	
        });	  
    }

	
    function seteditparm(index,arrdata){

         if(arrdata.length>0){   //存入的为所有已查出数据	
         console.info(arrdata);	                                      
                var arr= creatYanshouObj(arrdata,index);

                return arr;

            }else{

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

            }

     }

   

   
   function creatYanshouObj(arrdata,index){

     console.info(arrdata[0]);

     console.info(index);

            var StationId = arrdata[index].StationId;

            //console.info(StationId);

            var arr = new Array(); //初始化传参数组

            for(var i=0;i<arrdata.length;i++){//一次验收该机房下的所有电池组构建对象 。

                if(StationId == arrdata[i].StationId){		
                    var obj = {

                        binf:{

                            StationId : arrdata[i].StationId,    // 机房编号

                            StationName : (arrdata[i].StationName1+"-"+ arrdata[i].StationName2+"-"+arrdata[i].StationName5+"-"+arrdata[i].StationName3),    // 拼接机房名称

                            StationName1 :arrdata[i].StationName1,        // 省

                            StationName2 : arrdata[i].StationName2,        // 市

                            StationName5 :  arrdata[i].StationName5,        // 区/县

                            StationName3 :  arrdata[i].StationName3,        // 机房名称

                            StationName4 : arrdata[i].StationName4,        // 设备名称

                            StationIp :arrdata[i].StationIp,                //机房ip

                            FBSDeviceId : arrdata[i].FBSDeviceId,                //设备id

                            FbsDeviceIp : arrdata[i].FbsDeviceIp,                //设备ip

                            FbsDeviceIp_YM :  arrdata[i].FbsDeviceIp_YM,            // 设备掩码

                            FbsDeviceIp_WG : arrdata[i].FbsDeviceIp_WG ,            // 网关

                            FBSDeviceName : arrdata[i].FBSDeviceName,            //设备名称

                            GroupIndexInFBSDevice : arrdata[i].GroupIndexInFBSDevice,    //fbs设备索引

                            BattGroupId : arrdata[i].BattGroupId,                //电池组id

                            BattGroupNum : arrdata[i].BattGroupNum ,            //机房内电池组编号

                            BattGroupName :arrdata[i].BattGroupName,        //电池组索引

                            FloatVolLevel : arrdata[i].FloatVolLevel,            //浮充电压阀值

                            OfflineVolLevel : arrdata[i].OfflineVolLevel,            //离线电压阀值

                            BattFloatCurrent : arrdata[i].BattFloatCurrent,        //浮充电流阀值

                            MonCount : arrdata[i].MonCount,                //单体数量

                            MonCapStd : arrdata[i].MonCapStd,                //标称容量

                            MonVolStd : arrdata[i].MonVolStd,                //标称电压

                            MonResStd : arrdata[i].MonResStd,                //标称内阻

                            MonSerStd : arrdata[i].MonSerStd,                //标称电导

                            MonVolLowToAvg : arrdata[i].MonVolLowToAvg,            //单体电压次低偏移量

					
                            Load_curr : arrdata[i].Load_curr,                //负载电流

                            DisCurrMax : arrdata[i].DisCurrMax,                //最大核容电流

                            station_phone : arrdata[i].station_phone,            //基站号码

											
                            BattProducer : arrdata[i].BattProducer,            //电池品牌

                            BattModel : arrdata[i].BattModel,                //电池型号

                            BattProductDate :  arrdata[i].BattProductDate,        //电池生产日期

                            BattInUseDate :  arrdata[i].BattInUseDate,            //电池使用日期

                            install_user : arrdata[i].install_user,            //安装人员

                        }

                    }

                    arr.push(obj);

                }

            }

            console.info(arr);	
            //applyendyanshou(arr);//申请验收方法。

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

               setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔

            return arr;

        }

		
   function creatMonCapOpt(suoyin){       

       var k,optionStr='',allString   

        for(var i=1;i<11;i++){


 gx_tieta/WebRoot/mobil/checkAccept-index.html

@@ -19,7 +19,7 @@
            <div data-role="content">

                <ul data-role="listview" data-inset="true">

                    <li>

                        <a href="batt-approve-index.html" target="_top">待审批</a>

                        <a href="wapprovalBatt-index.html" target="_top">待审批</a>

                    </li>

                     <li>

                        <a href="batt-apprvedAccept-index.html" target="_top">待验收</a>