122

CJJ

2018-12-12 83154e82ff44c7af4c99f206cec18a9b693e1304

122

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

@@ -51,14 +51,18 @@
       return selected; 

  }    

      var temp = getCookie("eleparm");

      var tempindex = getCookie("eleparmindex");

    //console.info(temp);

    temp=JSON.parse(temp);

    tempindex = JSON.parse(tempindex);

    console.info(temp);

    console.info(temp[30]);

    console.info(temp[33]);

    console.info(tempindex);

	
    var suoyin = temp[33];

    

   $(function(){creatAllView(4)});

   $(function(){creatAllView(tempindex.length)});

    </script>

    <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>

    <style type="text/css">     

@@ -180,12 +184,6 @@
                                            </td>

                                        </tr>

                                        <tr>

                                            <td>FBS电池索引(0-3)</td>

                                            <td>

                                                <input type="text" id="GroupIndexInFBSDevice" data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>电池组ID</td>

                                            <td>

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

@@ -197,12 +195,7 @@
                                                <input type="text" readonly unselectable="on" value="123" id="BattGroupNum" class="uncheck" data-mini="true" />

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>电池组名称</td>

                                            <td>

                                                <input type="text" id="BattGroupName"  data-mini="true" />

                                            </td>

                                        </tr>

										
                                        <tr>

                                            <td>浮充电压阀值(V)</td>

                                            <td>

@@ -355,10 +348,10 @@
        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("GroupIndexInFBSDevice").value = temp[12];

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

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

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

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

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

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

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

@@ -378,51 +371,62 @@
        setTimes($("#startTestrecord"),temp[30]);

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

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

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

            battname = "#battname"+i;	
            $(battname).val(tempindex[i]);

        }

    }



    

    // 格式化提交后台信息的对象数组并返回 单个修改，手机方式不修改多个电池组

        function getUpdateArr(){

    // 格式化提交后台信息的对象数组修改

    function getUpdateArr(){

            var arr = new Array();

            var obj = new Object();

            obj.StationId = $("#StationId").val();    // 机房编号

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

            obj.StationName1 = $("#station_name1").val();        // 省

            obj.StationName2 = $("#city").val();        // 市

            obj.StationName5 = $("#county").val();        // 区/县

            obj.StationName3 = $("#StationName3").val();        // 机房名称

            obj.StationName4 = $("#StationName4").val();        // 设备名称

            obj.StationIp = $("#StationIp").val();                //机房ip

            obj.FBSDeviceId = $("#FBSDeviceId").val();                //设备id

            obj.FbsDeviceIp = $("#FbsDeviceIp").val();                //设备ip

            obj.FbsDeviceIp_YM = $("#FbsDeviceIp_YM").val();            // 设备掩码

            obj.FbsDeviceIp_WG = $("#FbsDeviceIp_WG").val();            // 网关

            obj.FBSDeviceName = $("#FBSDeviceName").val();            //设备名称

            obj.GroupIndexInFBSDevice = $("#GroupIndexInFBSDevice").val();    //fbs设备索引

            obj.BattGroupId = $("#BattGroupId").val();                //电池组id

            obj.BattGroupNum = $("#BattGroupNum").val();            //机房内电池组编号

            obj.BattGroupName = $("#BattGroupName").val();            //电池组名称

            obj.FloatVolLevel = $("#FloatVolLevel").val();            //浮充电压阀值

            obj.OfflineVolLevel = $("#OfflineVolLevel").val();            //离线电压阀值

            obj.BattFloatCurrent = $("#BattFloatCurrent").val();        //浮充电流阀值

            obj.MonCount = $("#MonCount").val();                //单体数量

            obj.MonCapStd = $("#MonCapStd").val();                //标称容量

            obj.MonVolStd = $("#MonVolStd").val();                //标称电压

            obj.MonResStd = $("#MonResStd").val();                //标称内阻

            obj.MonSerStd = $("#MonSerStd").val();                //标称电导

            obj.MonVolLowToAvg = $("#MonVolLowToAvg").val();            //单体电压次低偏移量

			
			
            obj.Load_curr = $("#Load_curr").val();                //负载电流

            obj.DisCurrMax = $("#DisCurrMax").val();                //最大核容电流

            obj.station_phone = $("#station_phone").val();            //基站号码

							
            obj.BattProducer = $("#BattProducer").val();            //电池品牌

            obj.BattModel = $("#BattModel").val();                //电池型号

            obj.BattProductDate =  $("#startTestrecord").val();        //电池生产日期

            obj.BattInUseDate =  $("#endTestrecord").val();            //电池使用日期

            obj.install_user = $("#install_user").val();            //安装人员

            arr.push(obj);

            for(var i=0;i<tempindex.length;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"),

                    binf:{

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

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

                        StationName1 : $("#station_name1").val(),        // 省

                        StationName2 : $("#city").val(),        // 市

                        StationName5 : $("#county").val(),        // 区/县

                        StationName3 : $("#StationName3").val(),        // 机房名称

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

                        StationIp : $("#StationIp").val(),                //机房ip

                        FBSDeviceId : $("#FBSDeviceId").val(),                //设备id

                        FbsDeviceIp : $("#FbsDeviceIp").val(),                //设备ip

                        FbsDeviceIp_YM : $("#FbsDeviceIp_YM").val(),            // 设备掩码

                        FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(),            // 网关

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

                        GroupIndexInFBSDevice : i,    //fbs设备索引

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

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

                        BattGroupName : $(battString).val(),

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

                        OfflineVolLevel : $("#OfflineVolLevel").val(),            //离线电压阀值

                        BattFloatCurrent : $("#BattFloatCurrent").val(),        //浮充电流阀值

                        MonCount : $("#MonCount").val(),                //单体数量

                        MonCapStd : $("#MonCapStd").val(),                //标称容量

                        MonVolStd : $("#MonVolStd").val(),                //标称电压

                        MonResStd : $("#MonResStd").val(),                //标称内阻

                        MonSerStd : $("#MonSerStd").val(),                //标称电导

                        MonVolLowToAvg : $("#MonVolLowToAvg").val(),            //单体电压次低偏移量

				
                        Load_curr : $("#Load_curr").val(),                //负载电流

                        DisCurrMax : $("#DisCurrMax").val(),                //最大核容电流

                        station_phone : $("#station_phone").val(),            //基站号码

										
                        BattProducer : $("#BattProducer").val(),            //电池品牌

                        BattModel : $("#BattModel").val(),                //电池型号

                        BattProductDate :  $("#startTestrecord").val()+" 00:00:00",        //电池生产日期

                        BattInUseDate :  $("#endTestrecord").val()+" 00:00:00",            //电池使用日期

                        install_user : $("#install_user").val(),            //安装人员

                    }

                }

                arr.push(obj);

            }

            console.info(arr);

            return arr;

        }

@@ -432,23 +436,21 @@
   $(function(){

    $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");

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

        if(temp[33]&&temp[33]=="new"){

            addBatt();

        }else{

            editParm();

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

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

                 setTimeout(backpage,500); 

              });

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

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

        */

        });

   });

   function editParm(){

           var parm = getUpdateArr();    

           console.info(parm);

           $.ajax({

                type: "post",                 

                url: "BattInfAction!update",				
                url: "Battinf_applyAction!updatePro",				
                async:true,                

                dataType:'text',

                data:"json="+JSON.stringify(parm),    

@@ -467,29 +469,7 @@
                }

         });

   }

   function addBatt(){

        var parm = getUpdateArr();	
        $.ajax({

            type: "post", 				
            url: "BattInfAction!add",				
            async:true,				
            dataType:'text',

            data:"json="+JSON.stringify(parm),	
            success: function(data){							        	
                data = eval('('+data+')');

                var model = eval('('+data.result+')');

                //console.info(model);

                if(model.code ==1){

                    alert("添加电池组成功!");

                }else{

                    alert("添加电池组失败!");

                }		
            },

            error:function(){

                alert("添加电池组发生错误!");

            }

        });

    }

 
  

     

    


 gx_tieta/WebRoot/mobil/batt-unapproved.html

@@ -162,6 +162,9 @@


       

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

    	
    	 
        //searchHomeInfoByName(homename);

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

    });

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

@@ -173,7 +176,7 @@
       // window.location.href="batt-infor-conf-delete.html";   

    });

     

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

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

    var endTime = new Date().format('yyyy-MM-dd');

@@ -244,7 +247,6 @@
                     arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);

                     arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);

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

                     arrTd[index++] = "";

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

                     }

                 }

@@ -255,25 +257,60 @@
             }

         });            

    }

		
	
        function searchHomeInfoByName(id) {

                    var groupName = new Array();

                    var index = 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);

                            data = data.data;

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

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

                            }

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

                        console.info(groupName);	
                        }

                    })

				    
        }		        		
    function setcookiedit(index){

                 var arrcookie = new Array();    

                   for(var i=0;i<33;i++){//共35项  ,33数据有用

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

                       console.info(value);

                       var value = Math.floor((arrTh.length)*index); //35

                       //console.info(value);

                       value = Math.floor(value+i);

                     if(i==13){//新建功能，电池组ID默认为当页最后一个电池组ID号加1

                         var groupid = Math.floor(arrTd[value]+1);

                         console.info(groupid);

                         //console.info(groupid);

                         arrcookie.push(groupid);

                     }else{

                           console.info(value);

                           //console.info(value);

                           arrcookie.push(arrTd[value]);

                       }

                   }

                   console.info($("#newbattnum").val());

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

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

                   //console.info(arrcookie);

                   var id = arrcookie[0];

                   console.info(id);

                   searchHomeInfoByName(id);

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

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

         }


 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java

@@ -139,7 +139,7 @@
                String sql_update_apply= "update db_battinf.tb_battinf_apply set StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',"

                        + "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +

                          "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "

                         +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"  where num="+bapply.getNum();

                         +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where num="+bapply.getNum();

                sql_str.add(sql_update_apply);

                {

                    String msg="修改"+binf.getStationName()+"机房"+binf.getBattGroupId()+"电池组的信息";