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

hdw

2018-12-28 4abd3227995e56e222e2d2ede882adb302da23d4

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

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

@@ -66,21 +66,7 @@
                                <table class="layout-set">

                                    <tbody>

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

										
                                        <tr>

                                            <td>FBS设备ID(重要)</td>

                                            <td>

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

                                            </td>

                                        </tr>

                                        <tr>

                                            <td>FBS设备IP(重要)</td>

                                            <td>

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

                                            </td>

                                        </tr>

										
                                                <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />

                                            <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />

                                            

                                        <tr>

                                            <td>省</td>

@@ -214,17 +200,20 @@
  function creatBattView(index){

         var count=index+1

            ,battTitle='<div>'+'<h1 class="hbg">'+'电池组'+count+'</h1>'+

             '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'电池品牌'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'

            ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' 
             '<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'电池品牌'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'

            ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/

            ,battBrand='<tr>'+'<td>'+'电池品牌'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'电池品牌'+count+' />'+'</td>'+'</tr>' 
            ,battType='<tr>'+'<td>'+'电池型号'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'电池型号'+count+' />'+'</td>'+'</tr>' 

            ,battNum='<tr>'+'<td>'+'*单体数量'+'</td>'+'<td>'+'<fieldset data-role="controlgroup"  data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'

            ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'     
              ,battNum='<tr>'+'<td>'+'*单体数量'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCount'+index+' data-mini="true"'+'value='+'单体数量'+count+' />'+'</td>'+'</tr>' 
            //,battNum='<tr>'+'<td>'+'*单体数量'+'</td>'+'<td>'+'<fieldset data-role="controlgroup"  data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'

            //,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'     
            ,MonVolStd='<tr>'+'<td>'+'*标称单体电压(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'

            ,nomCap='<tr>'+'<td>'+'*标称容量(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'

             +'</fieldset>'+'</td>'+'</tr>' 
            //,nomCap='<tr>'+'<td>'+'*标称容量(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'

            // +'</fieldset>'+'</td>'+'</tr>' 
             ,nomCap='<tr>'+'<td>'+'*标称容量'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCapStd'+index+' data-mini="true"'+'value='+'标称容量'+count+' />'+'</td>'+'</tr>' 
            ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>' 

            ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'电池组'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';

         return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;             
         return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName;             
  }    

   function selectedNum(index){

      var selected='';

@@ -350,8 +339,8 @@
            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 = data.FbsDeviceIp;

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

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

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

@@ -386,7 +375,8 @@
                $("#MonCount"+i).find("option:selected").val(data.MonCount);

                var battString = "#battname"+i;

                var battModel = "#batttype"+i;

                var battproducer = "#battproducer"+i

                var battproducer = "#battproducer"+i;

                $('#MonCount'+i).val(data.MonCount);

                //var battproducer ="#battproducer"+i; 

                $(battString).val(data.BattGroupName);

                $(battModel).val(data.BattModel);