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

hdw

2019-01-02 f9d23044053af56468e37741d3b5aae80d7efc66

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

 gx_tieta/WebRoot/mobil/batt-edit2.html

@@ -73,8 +73,9 @@
                                    

                                                <input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" />

                                            

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

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



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

                                            <td>省</td>

                                            <td>

                                                <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>

@@ -101,8 +102,7 @@
                                        

                                            

                                                <input type="hidden" id="StationName4" data-mini="true" />

											
										
												
                                                <input type="hidden" id="StationIp" data-mini="true" />

                                                                

                                                <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>    

@@ -154,6 +154,10 @@
                                                <input type="hidden" id="MonResStd" data-mini="true" />    

                                                <input type="hidden" id="MonSerStd" data-mini="true" />

                                                <input type="hidden" id="MonVolLowToAvg" data-mini="true" />

                                                <input type="hidden" id="fuchongfazhi0" data-mini="true" />

                                                <input type="hidden" id="fuchongfazhi1" data-mini="true" />

                                                <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />

                                                <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />

                                        

                                        <tr>

                                            <td>*负载电流(A)</td>

@@ -294,8 +298,8 @@
    console.info(temp);

    var moncount = 0;

    var tempgroupid = new Array() ;

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

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

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

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

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

        tempgroupid.push(temp[i].binf.BattGroupId);

    }

@@ -310,8 +314,7 @@
 

    $(function () {

        //setTimes($("#startTestrecord"),'2000-01-01');

        //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));

		
        //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));	
        installstartdata(temp);

    });

    

@@ -369,10 +372,8 @@
          var chargeVol = (vol*1.117*monnum).toFixed(1);        // 浮充电压阀值

        var outlineVol = (vol*1.073*monnum).toFixed(1);        // 离线电压阀值

    

        //$('#BattFloatCurrent').val(chargeVol);        // 浮充电压阀值

        //$('#OfflineVolLevel').val(outlineVol);    // 离线电压阀值

        fuchongfazhi[index] = chargeVol;

        lixiandianyafazhi[index] = outlineVol;

        $("#fuchongfazhi"+index).val(chargeVol);       // 浮充电压阀值

        $("#lixiandianyafazhi"+index).val(outlineVol);   // 离线电压阀值

        console.info(vol);

     }

 

@@ -385,6 +386,8 @@
    function installstartdata(temp){

            data=temp[0].binf;

            setMonVolStd(temp.length);

            //creatgroupid();

            var ip = getDevIp(data.FBSDeviceId);

            document.getElementById("StationId").value = data.StationId;

            document.getElementById("mainteArea").value = data.StationName1;

            document.getElementById("city").value = data.StationName2;            //市

@@ -392,17 +395,17 @@
            document.getElementById("homeName").value = data.StationName3;   //机房名称

            document.getElementById("StationName4").value = data.StationName4;    //设备名称

            document.getElementById("StationIp").value = data.StationIp;        //设备IP

            document.getElementById("FBSDeviceId").value = data.FBSDeviceId;	
            document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;

            document.getElementById("FBSDeviceId").value = data.FBSDeviceId;			
            document.getElementById("FbsDeviceIp").value = ip;

            document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;

            document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;

            document.getElementById("FBSDeviceName").value = data.FBSDeviceName;

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

            document.getElementById("BattGroupId").value = data.BattGroupId;

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

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

            document.getElementById("FloatVolLevel").value = data.FloatVolLevel;

            document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;

            //document.getElementById("FloatVolLevel").value = data.FloatVolLevel;

            //document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;

            document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;

            //document.getElementById("MonCount").value = data.MonCount;

            //document.getElementById("MonCapStd").value = data.MonCapStd;        

@@ -421,6 +424,8 @@
            document.getElementById("install_user").value = data.install_user;        

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

                data=temp[i].binf;

                console.info(data.BattGroupId);

                document.getElementById("BattGroupId"+i).value = data.BattGroupId;

                document.getElementById("MonCapStd"+i).value = data.MonCapStd;

                document.getElementById("MonVolStd"+i).value = data.MonVolStd;

                console.info(data.MonCount);

@@ -470,11 +475,11 @@
                        FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(),            // 网关

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

                        GroupIndexInFBSDevice : i,    //fbs设备索引

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

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

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

                        BattGroupName : $(battString).val(),

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

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

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

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

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

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

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

@@ -531,7 +536,9 @@
         }

     }

     

     function editBatt(){//

 	
     function editBatt(){

         //creatgroupid(); //id，ip

         console.info(getUpdateArr());

         var temp = JSON.stringify(getUpdateArr());

         console.info(temp);


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

@@ -159,6 +159,13 @@
                                                

                                                <input type="hidden" id="MonVolLowToAvg" data-mini="true" />

                                        

                                                <input type="hidden" id="fuchongfazhi0" data-mini="true" />

												
                                                <input type="hidden" id="fuchongfazhi1" data-mini="true" />

												
                                                <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />

												
                                                <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />

                                        <tr>

                                            <td>*负载电流(A)</td>

                                            <td>

@@ -470,10 +477,8 @@
          var chargeVol = (vol*1.117*monnum).toFixed(1);        // 浮充电压阀值

        var outlineVol = (vol*1.073*monnum).toFixed(1);        // 离线电压阀值

    

        //$('#BattFloatCurrent').val(chargeVol);        // 浮充电压阀值

        //$('#OfflineVolLevel').val(outlineVol);    // 离线电压阀值

        fuchongfazhi[index] = chargeVol;

        lixiandianyafazhi[index] = outlineVol;

        $("#fuchongfazhi"+index).val(chargeVol);       // 浮充电压阀值

        $("#lixiandianyafazhi"+index).val(outlineVol);   // 离线电压阀值

        console.info(vol);

     }

     

@@ -565,7 +570,7 @@
            //setTimes($("#endTestrecord"),data.useDate);

            document.getElementById("install_user").value = data.install_user;            

            setFloatAndoutLine(1);

        //setFloatAndoutLine();

            //setFloatAndoutLine();

    }

    

        function getUpdateArr(){

@@ -609,8 +614,8 @@
                        BattGroupId : $("#BattGroupId").val(),                //电池组id

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

                        BattGroupName : $(battString).val(),

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

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

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

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

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

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

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

@@ -635,7 +640,7 @@
            console.info(arr);

            return arr;

        }

	
	 
</script> 

<script type="text/javascript">  

    $(function(){


 gx_tieta/WebRoot/mobil/index.html

@@ -22,7 +22,7 @@
                <a href="machineroomM.html" target="_top" data-i18n="main.index">测试数据</a>

            </li>

            <li>

                <a href="testControl.html" target="_top" data-i18n="main.warningmanagement">电池安装申请</a>

                <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">电池安装申请</a>

            </li>

            <li>

                <a href="auditDetail.html" target="_top" data-i18n="main.warningmanagement">审批详情</a>