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

81041

2019-01-18 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e

 gx_tieta/WebRoot/mobil/batt-edit2.html

@@ -26,17 +26,17 @@
         white-space: nowrap;

      }

      .uncheck{

          background-color: #dddddd38!important;

            color: #bdbdbdc4!important;

          background-color: #ddd!important;

            color: #000!important;

      }

      .ui-btn-icon-right {

            padding-right: 8.5em;

        }

        .hbg{

            background-color:#ddd9;

            background-color:#ddd;

        }

        #battdata {

            background-color:#dddddd54

            background-color:#eee;

        }

        .ui-select .ui-btn select{

            width:77%;

@@ -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()"/>

@@ -95,40 +96,26 @@
                              <tr>

                                 <td>机房名称</td>

                                 <td>

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

									            	
                                    <textarea id="homeName" class="unable" data-mini="true"></textarea>		
                                 </td>

                              </tr>

                              

                                 

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

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

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

											
										
                           

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

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

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

											
										
                                 

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

                                 

@@ -144,9 +131,7 @@
                                         <label for="twentyfour">24个</label>

                                         <input type="radio" name="battnum" id="twentyfour" value="24"> 

                                       </fieldset>

											        
											    
												
											        												
                                 </td>

                              </tr>

                              <tr>

@@ -169,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>

@@ -181,7 +170,7 @@
                                 

                              

                              <tr>

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

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

                                 <td>

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

                                 </td>

@@ -290,10 +279,12 @@


 

  function selectedIndex(index){

    var battproducer = getCookie("producer");

   battproducer = JSON.parse(battproducer);

     console.info(battproducer);

       var selected='',

           i=0;

       var battproducer = ["理士","圣阳","双登","SENRY","南都","爱默生","科士达","银泰","丰日","中兴能派","光宇",

       "艾诺斯华达","雄韬","风帆","文隆","中山"];

       //onsole.info(inde)

       selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';

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

             if(temp[index].binf.BattProducer!=battproducer[i]){

@@ -309,8 +300,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);

   }

@@ -323,14 +314,9 @@
   

   });

 

    
   
   


   $(function () {

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

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

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

   });

   

@@ -388,10 +374,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);

    }

 

@@ -404,6 +388,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;         //市

@@ -411,18 +397,19 @@
         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("BattFloatCurrent").value = data.BattFloatCurrent;

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

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

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

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

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

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

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

@@ -440,6 +427,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);

@@ -459,7 +448,6 @@
      function getUpdateArr(){

         mon=$('#MonVolStd').val();

      

			
         var arr = new Array();

         

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

@@ -490,11 +478,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(),            //标称容量

@@ -542,10 +530,18 @@
   });

    

    function nullOrn(){

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

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

       if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){

          return true;   

       }else{

          alert("请填写*内容");

       }

    }

    

    function editBatt(){//

 	
    function editBatt(){

       //creatgroupid(); //id，ip

       console.info(getUpdateArr());

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

       console.info(temp);