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

81041

2018-12-13 512733908ae4f3a851f40f0551724d2186ce56ec

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

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

@@ -363,8 +363,9 @@
                ,data: null

                ,dataType: 'json'

                ,success:function(res) {

                    //console.info(res);

                    console.info(res);

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

                    console.info(data);

                    if(data.length!=0){

                        data = data.data;

                        dev_id = data;

@@ -429,7 +430,7 @@
        document.getElementById("FBSDeviceName").value = temp[11];

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

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

        document.getElementById("BattGroupNum").value = temp[14];

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

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

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

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

@@ -513,8 +514,8 @@
    $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");

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

        addBatt();     

           function backpage(){window.location.href="ele-param1.html";}

                 setTimeout(backpage,500); 
           //function backpage(){window.location.href="ele-param1.html";}

      //           setTimeout(backpage,500); 
              });

       // $("#cancel").click(function(){

       //  window.location.href="ele-param1.html";


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

@@ -458,12 +458,15 @@
                    console.info(model);

                    if(model.code ==1){

                        alert("修改成功");

                        window.location.href="batt-unapproved.html"

                    }else{

                        alert("修改失败!");

                        window.location.href="batt-unapproved.html"

                    }        

                },

                error:function(){

                    alert("修改电池组失败!");

                    window.location.href="batt-unapproved.html"

                }

         });

   }


 gx_tieta/WebRoot/mobil/batt-unapproved.html

@@ -162,16 +162,14 @@


       

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

    	
    	 
        //searchHomeInfoByName(homename);

        window.location.href="batt-infor-unapproved-edit.html";   
        //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";   
        //window.location.href="batt-unapproved.html";   
    });

     

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

@@ -309,7 +307,7 @@
                   }

                   arrcookie.push($("#newbattnum").val());

                   var id = arrcookie[0];

                   console.info(id);

                   //console.info(id);

                   searchHomeInfoByName(id);

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

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

@@ -323,9 +321,17 @@
            data:"json="+JSON.stringify(parm),     

            success: function(data){

                console.info(data);

                alert("删除成功");

                data = JSON.parse(data.result);

                if(data.code==1){

                    alert("删除成功");

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

                    alert("删除失败");

                    window.location.href="batt-unapproved.html"; 
                }

            }

        }); 

 		
     }    

    function battDeleteparm(){

        var arr = new Array();

@@ -335,12 +341,14 @@
        temp=JSON.parse(temp);

        tempindex = JSON.parse(tempindex);

        tempnum =JSON.parse(tempnum);

        console.info(temp);

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

        //console.info(temp);

        //var numinsert;

        console.info(temp[12]);

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

            //console.info(battString);

            var obj = {

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

                num : tempnum[i],

                num : tempnum[temp[12]],

                binf:{

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

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

@@ -355,10 +363,10 @@
                    FbsDeviceIp_YM : temp[9],            // 设备掩码

                    FbsDeviceIp_WG : temp[10],            // 网关

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

                    GroupIndexInFBSDevice : i,    //fbs设备索引

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

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

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

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

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

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

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

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

@@ -381,7 +389,7 @@
                }

            }

            arr.push(obj);

        }

        //}

        console.info(arr);

        return arr;