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

hdw

2018-12-19 d3d3f559854042f8f71ece4e576cced226aa1605

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

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

@@ -260,7 +260,7 @@
                                            </td>

                                        </tr>

                                        <tr>

                                            <td>基站号码</td>

                                            <td>基站电话号码</td>

                                            <td>

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

                                            </td>

@@ -434,7 +434,7 @@
                ,FbsDeviceIp: '127.0.0.1'

                ,FbsDeviceIp_YM: '255.255.255.0'

                ,FbsDeviceIp_WG: '127.0.0.1'

                ,FBSDeviceName: '设备名称'

                ,FBSDeviceName: 'BTS'

                ,GroupIndexInFBSDevice: 1 

                ,BattGroupId: 1000005

                ,BattGroupNum: 2

@@ -483,7 +483,7 @@
    //        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("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;

@@ -593,7 +593,8 @@
    $(function(){

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

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

            addBatt(); 	
            creatgroupid();//提交之前再次验证，创建ID

            addBatt();     //提交

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

             // setTimeout(backpage,500); 

        });