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

81041

2018-12-27 4e01314d7af9b27128570a452da01fa9bfccc29d

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

@@ -47,9 +47,6 @@
          right: 0;

          margin:0!important; 

        }

         #newbattnum-button{

            padding: 1em 1.9em;

         }

   </style>

   <link rel="stylesheet" href="css/fgpanel.css">

</head>

@@ -58,31 +55,18 @@
      

      <!-- 头部内容 -->

      <div data-role="header" data-position="fixed">

         <a href="ele-param2.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

         <h1>修改电池组信息配置</h1>

         <a href="batt-unapproved-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

         <h1>未审批通过电池组详情</h1>

         <fieldset data-role="controlgroup" class="ptr0" >

		           
		           
                     <select id="newbattnum" data-mini="true">

                       <option value=0>新建电池组</option>

			              
                     </select>

			            
		            	
                 </fieldset>

			
      </div>

      <!-- 主体内容 -->

      <div data-role="main">

         <!-- <div class="set-option"> -->

                        <table class="layout-set">

                           <tbody>

                              <tr>

                                 <td>机房编号</td>

                                 <td>

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

                                 </td>

                              </tr>

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

										
                              <tr>

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

                                 <td>

@@ -95,12 +79,9 @@
                                    <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />

                                 </td>

                              </tr>

                              <tr>

                                 <td>电池组ID</td>

                                 <td>

                                    <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" 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()" />

											
                              <tr>

                                 <td>省</td>

                                 <td>

@@ -122,46 +103,20 @@
                              <tr>

                                 <td>机房名称</td>

                                 <td>

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

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

                                          

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

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

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

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

@@ -169,17 +124,17 @@
                              <tr>

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

                                 <td>

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

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

                                 </td>

                              </tr>

                              

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

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

                                 

                              

                              <tr>

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

                                 <td>

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

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

                                 </td>

                              </tr>



@@ -190,7 +145,7 @@
                              <tr>

                                 <td>*安装人员</td>

                                 <td>

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

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

                                 </td>

                              </tr>

                           </tbody>

@@ -230,8 +185,8 @@
      <div data-role="footer" data-position="fixed" data-theme="a">    

         <div data-role="navbar">

            <ul>

              <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">确定</a></li>

              <li><a href="" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">取消</a></li>

              <li><a href="batt-approve-index.html" target="_top" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">已审核</a></li>

              <li><a href="batt-unapproved-index.html"  class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">取消</a></li>

            </ul>

         </div>      

      </div>   

@@ -259,16 +214,16 @@
  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+'>'

             '<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>' 

            ,battType='<tr>'+'<td>'+'电池型号'+'</td>'+'<td>'+'<input type="text" '+'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+'>'

            ,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>'     

            ,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"'+'>'+creatMonCapOpt(index)+'</select>'

            ,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>' 

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

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

  }   

   function selectedNum(index){

@@ -277,21 +232,8 @@
    return selected='<option '+'value='+4+' selected=selected' +'>'+'4 个'+'</option>'+'<option '+'value='+24 +'>'+'24个'+'</option>';

     }else{

      return selected='<option '+'value='+24+' selected=selected' +'>'+'24 个'+'</option>'+'<option '+'value='+4 +'>'+'4个'+'</option>';

  	
     }

  }

  function creatBa(a){

        var battnum=4-a,

            opstring='';        
        if(a>4&&battnum<=0){return false;}

        for(var i=0;i<=battnum;i++){

             
           opstring+='<option value='+i+'>新建'+i+'个电池组</option>';

        }

         console.warn(opstring+'ttt'); 
         return $('#newbattnum').html(opstring);

   }

  
 

   function selectedIndex(index){

       var selected='',

@@ -321,13 +263,8 @@
   var lixiandianyafazhi = [0,0,0,0];

   $(function(){

   creatAllView(temp.length).trigger('create');

   setchangedMonVolStd(temp.length);

   creatBa(temp.length).trigger('create');

   setMonVolStd(temp.length);

   });

 
    
   
   


   $(function () {

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

@@ -401,17 +338,7 @@
    function prefixInteger(num, length) {

       return (num/Math.pow(3,length)).toFixed(length).substr(2);

   }

   function creatBa(a){

        var battnum=4-a,

            opstring='';        
        if(a>4&&battnum<=0){return false;}

        for(var i=0;i<=battnum;i++){

             

           opstring+='<option value='+i+'>新建'+i+'个电池组</option>';

        }

         console.warn(opstring+'ttt'); 
         return $('#newbattnum').html(opstring);

   }

   //导入表格默认数据

   function installstartdata(temp){

         data=temp[0].binf;

@@ -633,16 +560,6 @@
       }

       return selected; 

  }   

   $('#newbattnum').change(function(){

       var numbattnum = parseInt($('#newbattnum').val());

       var index =parseInt(tempindex.length);

       addbattnum=Math.floor((numbattnum)+(tempindex.length));

       console.warn(addbattnum);

       creatAllView(addbattnum).trigger('create');

       creatBattGroupId(addbattnum);

   });

   
   
   

   function getSelected(id){

   /*  var s;

@@ -674,7 +591,7 @@
      

          

   }*/

   function setchangedMonVolStd(suoyin){

   function setMonVolStd(suoyin){

         for(var u=0;u<suoyin;u++){  

           var id='';  

          id='#MonCount'+u;