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

hdw

2018-12-14 dc02dd50c591464197c4daac2e76ed580ee56453

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

 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -330,8 +330,12 @@
                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;

                }   
                arrTd[i]=i*10;

                }

                if(i=13){

                    arrTd[i]=1002102;

                }else{   
                    arrTd[i]=i;

                }

            }

                        

            createTbl(tblCon, arrTh, arrTd);


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

@@ -53,7 +53,13 @@
      var temp = getCookie("eleparm");

      var tempindex = getCookie("eleparmindex");

    var tempnum = getCookie("eleparmnum");

    //var temp

    //console.info(temp);

    var tempgroupid = getCookie("elegroupid");

    console.info(tempgroupid);

    tempgroupid = JSON.parse(tempgroupid);

    console.info(tempindex);

    console.info(tempnum);

    temp=JSON.parse(temp);

    tempindex = JSON.parse(tempindex);

    tempnum =JSON.parse(tempnum);

@@ -180,12 +186,7 @@
                                                <input type="text" id="FBSDeviceName" data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>电池组ID</td>

                                            <td>

                                                <input type="text" readonly unselectable="on" value="123" id="BattGroupId" class="unable" class="uncheck" data-mini="true" />

                                            </td>

                                        </tr>

										
                                        <tr>

                                            <td>机房内电池组编号</td>

                                            <td>

@@ -346,7 +347,7 @@
        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("BattGroupId").value = temp[13];

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

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

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

@@ -377,6 +378,7 @@
    // 格式化提交后台信息的对象数组修改

    function getUpdateArr(){

            var arr = new Array();

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

                var battString = "#battname"+i;

                var index = String(i);

@@ -400,7 +402,7 @@
                        FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(),            // 网关

                        FBSDeviceName : $("#FBSDeviceName").val(),            //设备名称

                        GroupIndexInFBSDevice : i,    //fbs设备索引

                        BattGroupId : $("#BattGroupId").val(),                //电池组id

                        BattGroupId : tempgroupid[i],                //电池组id

                        BattGroupNum : $("#BattGroupNum").val(),            //机房内电池组编号

                        BattGroupName : $(battString).val(),

                        FloatVolLevel : $("#FloatVolLevel").val(),            //浮充电压阀值

@@ -460,7 +462,7 @@
                    console.info(model);

                    if(model.code ==1){

                        alert("修改成功");

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

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

                    }else{

                        alert("修改失败!");

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


 gx_tieta/WebRoot/mobil/batt-unapproved.html

@@ -162,7 +162,7 @@
        console.warn($(t).attr("but-index")+' 修改');

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

           setcookiedit(index);

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

    }

    

@@ -178,7 +178,7 @@
       

    $("#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();

@@ -267,25 +267,14 @@
             }

         });             

     }    

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

             if(i%34==33){

            arrTd[i]='<a onclick="getEditButIndex(this)"  id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改</a>'+'<a onclick="getDeleteButIndex(this)" href="#myPopup" id="" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>删除</a>';

			
            continue;

			
            } 
			       
                     arrTd[i]=i*10;

                    }

						
                    createTbl(tblCon, arrTh, arrTd);

    }*/

	
 	
    //查询当前机房有几个电池组，并set入COOKIE

        function searchHomeInfoByName(id) {

                    var groupName = new Array();

                    var index = 0;

                    //var index = 0;

                    var num =new Array();

                    var index1 = 0;

                    var groupId = new Array();

                    //var index1 = 0;

                    var temp = {

                        binf:{

                            StationId:id,                    // 省    

@@ -308,14 +297,20 @@
                            data = data.data;

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

                            console.info(data[i]);

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

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

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

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

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

                            }

				        	
                        var json = JSON.stringify(groupName);

                        var json1 =JSON.stringify(num);    
                        setCookie("eleparmindex",json);

                        setCookie("eleparmnum",json1);

                        console.info(groupName);	
                        var json1 =JSON.stringify(num);

                        var json2 = JSON.stringify(groupId);    
                        setCookie("eleparmindex",json);             //电池组名称

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

                        console.info(groupName);

                        setCookie("elegroupid",json2);

                        console.info(json2)

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

                    })

                    

@@ -334,11 +329,12 @@
                       }

                   }

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

                   var id = arrcookie[0];

                   var id = arrcookie[0];   //机房ID

                   //console.info(id);

                   searchHomeInfoByName(id);

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

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

                   searchHomeInfoByName(id);   	
			     
         }

     function delBatt(parm){

         $.ajax({