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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

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

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties

@@ -1125,3 +1125,6 @@


##################  sys-set-test.jsp     ##############################

Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e


##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2

 gx_tieta/WebRoot/bts-comm-mon.jsp

@@ -15,7 +15,7 @@
        <meta http-equiv="expires" content="0">    

        <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">

        <meta http-equiv="description" content="This is my page">

        <title>电池注册信息查询</title>							
        <title><s:text name="Batt_conn_info_query"/></title>                        <!-- 电池组连接信息查询 -->			
        <link rel="stylesheet" type="text/css" href="pages/css/base.css">

        <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">

        <link rel="stylesheet" type="text/css" href="src/css/layui.css">

@@ -105,9 +105,12 @@
                    ,cols: [[

                        {field: 'Staionanme', title: '机房名称', align: 'center', width: 450}

                        ,{field:'dev_id', title:'设备id', align:'center', width: 260}

                        ,{field:'battgroup_id', title:'电池组id', align:'center', width: 260}

                        ,{field:'battgroup_index', title:'电池组索引', align:'center', width: 260}

                        ,{field:'battgroup_mon_cnt', title:'电池组单体个数', align:'center', width: 260}

                        ,{field:'battgroup_id', title:'电池组id', align:'center', width: 200}

                        ,{field:'battgroup_index', title:'电池组索引', align:'center', width: 200}

                        ,{field:'battgroup_mon_cnt', title:'电池组单体个数', align:'center', width: 200}

                        ,{field:'battgroup_float_vol', title:'浮充电压', align:'center', width: 200}

                        ,{field:'battgroup_float_curr', title:'浮充电流', align:'center', width: 200}

                        ,{field:'battgroup_register_code', title:'注册码', align:'center', width: 200}

                        

                    ]]

                    ,data:[]

@@ -151,6 +154,9 @@
                                    _tmp.battgroup_id = _data.battgroup_id;

                                    _tmp.battgroup_index = _data.battgroup_index;

                                    _tmp.battgroup_mon_cnt = _data.battgroup_mon_cnt;

                                    _tmp.battgroup_float_vol = _data.battgroup_float_vol;

                                    _tmp.battgroup_float_curr = _data.battgroup_float_curr;

                                    _tmp.battgroup_register_code = _data.battgroup_register_code;

                                    

                                    arr_td.push(_tmp);

                                    Page.setAll(_data.num);


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

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

            margin:0!important; 

        }

            #newbattnum-button{

            padding: 1em 1.9em;

         }

    </style>

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

</head>

@@ -58,19 +61,26 @@
            <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>

                                            <input  type="hidden" id="StationId" class="unable" 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()" />

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

                                            

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

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

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

                

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

                                        <tr>

                                            <td>省</td>

                                            <td>

@@ -89,6 +99,7 @@
                                                <input type="text" id="country" class="unable" data-mini="true" onfocus="this.blur()"/>       

                                            </td>

                                        </tr>

						
                                        <tr>

                                            <td>机房名称</td>

                                            <td>

@@ -111,21 +122,27 @@
                                                <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="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>

                                            <td>

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

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

                                            </td>

                                        </tr>

                                        

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

                                            

										
                                        <tr>

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

                                            <td>

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

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

                                            </td>

                                        </tr>



@@ -136,47 +153,19 @@
                                        <tr>

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

                                            <td>

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

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

                                            </td>

                                        </tr>

                                    </tbody>

                                </table>

                            <!-- </div> -->

                                <div id="battdata">

                                     <!-- <div>

                                    <h1 class="hbg">电池组1</h1>

                                      <table class="layout-set">   
                                        <tbody>

                                            <tr>

                                                <td>设备索引</td>

                                                <td>

                                                     <fieldset data-role="controlgroup" data-type="horizontal">  
                                                            <select>

                                                              <option value="">0</option>

                                                              <option value="mon">1</option>

                                                              <option value="mon">2</option>

                                                              <option value="mon">3</option>

												              
                                                            </select>

                                                      </fieldset>      
                                                </td>    
                                            </tr>

                                            <tr>

                                                 <td>电池组名称</td>

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

                                            </tr>

                                        </tbody>

                                    </table>

                                   </div>      -->

                                </div> 

							  
			
        </div>

		
        <div data-role="footer" data-position="fixed" data-theme="a">    

            <div data-role="navbar">

                <ul>

                  <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="#yourPopup" data-rel="popup" id="deletemyPopup"  class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="check" data-role="button">修改</a></li>

                  <li><a href="#myPopup" data-rel="popup" id="deletemyPopup"  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>        

@@ -200,7 +189,7 @@
function creatAllView(num){

        var allString=''

           ,i=0;

       if(num>4){return false}

       if(num>2){return false}

       for(i=0;i<num;i++){

         allString+=creatBattView(i);

       }

@@ -214,6 +203,52 @@
           battDeleteparm();   

    });

  

    function creatBa(a){

        var battnum=2-a,

            opstring='';        
        if(a>2&&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);

   }

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

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

        var index =parseInt(temp.length);

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

        console.warn(addbattnum);

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

        creatBattGroupId(addbattnum);

        installstartdata(temp);

        installaddnew();

        setchangedMonVolStd(addbattnum);

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

   });

   function creatBattGroupId(addbattnum){

        $.ajax({type: "post", 				
                url: "BattInfAction!searchMaxBattgroupId",				
                async:true,				
                dataType:'text',

                data:null,	
                success: function(data){

                    data=JSON.parse(data);

                    data=data.result;

                    data =JSON.parse(data);

                    //console.info(data)

                    var groupid = data.data;

                    //console.info(groupid);

                    //tempgroupid.push(groupid);

                    console.info(tempgroupid);

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

                        $("#BattGroupId"+i).val(groupid++);

                        //tempgroupid.push(groupid++);

                        console.info(tempgroupid);

                    }

                }

        });	
    }  
  function battDeleteparm(){

      var parm = getUpdateArr();

      console.info(parm);

@@ -239,12 +274,12 @@
            }

        });     

  }      

  function creatBattView(index){

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

            ,battBrand='<tr>'+'<td>'+'电池品牌'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'电池品牌'+count+' />'+'</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>'+'<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" '+'>'

@@ -256,24 +291,52 @@
            ,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+MonVolStd+nomCap+battIndex+battName;             

  }*/

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

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

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

             +'</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>';

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

   function selectedNum(index){

      var selected='';

    if(temp[index]){  
    if(temp[index].binf.MonCount==4){  

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

          }

      }else{

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

      }

  } 

 

   function selectedIndex(index){

       var selected='',

           i=0;

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

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

       console.info(index);

       var battproducer = getCookie("producer");

        battproducer = JSON.parse(battproducer);

       if(temp[index]){

       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]){

                        selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';	
                   } 
           }

       }else{

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

                   console.info(battproducer[i]);

                    selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';    

               } 

       }

@@ -294,43 +357,18 @@
    var lixiandianyafazhi = [0,0,0,0];

   $(function(){

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

   setMonVolStd(temp.length);

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

       setMonVolStd(addbattnum);

       setchangedMonVolStd(addbattnum);

   });

 

    $(function () {

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

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

		
        installstartdata(temp);

    });

    

    function creatgroupid(){

        var dev_id ='';

        $.ajax({

                type: 'post'

                ,async: true

                ,url: 'BattInfAction!searchmaxdev_id'

                ,data: null

                ,dataType: 'json'

                ,success:function(res) {

                    console.info(res);

                    var data = JSON.parse(res.result);

                    console.info(data);

                    if(data.length!=0){

                        data = data.data;

                        dev_id = data;

                        //console.info(dev_id);

                        document.getElementById("FBSDeviceId").value = dev_id;

                        var ip = getDevIp(dev_id);

                        //console.info(ip);

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

                    }else{

                        alert("groupid生成失败");

                    }

                }   
        

        });	
    }

    // 根据设备id计算设备ip

    function getDevIp(dev_id) {

        var ptn = /^91([0-9]{7})$/;

@@ -351,20 +389,23 @@
    

        // 设置浮充电压阀值/设置离线电压阀值   //

      function setFloatAndoutLine(index) {

    console.info(index);

          var monvolstd = "#MonVolStd"+index;

          var MonCount = "#MonCount" +index;

          var vol = $(monvolstd).val();

          var monnum = $(MonCount).val();

          console.info(monnum)

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

     }

     

    function prefixInteger(num, length) {

        return (Array(length).join('0') + num).slice(-length);

    }

 

    function prefixInteger(num, length) {

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

@@ -374,6 +415,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;            //市

@@ -382,20 +425,20 @@
            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("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("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;

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

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

@@ -411,14 +454,15 @@
            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);

                $("#MonCount"+i).find("option:selected").val(data.MonCount);

                var battString = "#battname"+i;

                var battModel = "#batttype"+i;

                var battproducer = "#battproducer"+i;

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

                var battproducer = "#battproducer"+i

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

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

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

@@ -427,28 +471,44 @@
            }

    }

    

    // 格式化提交后台信息的对象数组并返回 单个修改，手机方式不修改多个电池组

    function installaddnew(){

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

        $("#battproducer"+i).val("");

    }

     function setchangedMonVolStd(suoyin){

         for(var u=0;u<suoyin;u++){  
           var id='';  
          id='#MonCount'+u; 
          (function(u){

              var vol='#MonVolStd'+u;

              $(document).on("change", id, function () {

                     if($(this).find("option:selected").val()==4){$(vol).val(12);}

                     if($(this).find("option:selected").val()==24){$(vol).val(2);} 
              })

          })(u)

               
         }    
   }

   
        function getUpdateArr(){

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

            //moncount = ;

		
            var arr = new Array();

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

            console.info(addbattnum);

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

            console.info(i);

                setFloatAndoutLine(i);

				
                var battString = "#battname"+i;

                var battModel = "#batttype"+i;

                var battproducer ="#battproducer"+i; 

                var nomCap = "#nomCap"+i;

                //var id = $('fieldset div div input[data-cacheval=\'true\']').val();

                //var inputVal = $(id).val();

                var id = $('fieldset div div input[data-cacheval=\'true\']').val();

                var inputVal = $(id).val();

                //var input =$(four).option()

                //console.info(inputVal)

                console.info(inputVal)

                var index = String(i);

                console.info(battString);

                var obj = {

                    //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                    num : temp[i].num,

                    apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),

                    binf:{

                        StationId : $("#StationId").val(),    // 机房编号

                        StationName : ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()),    // 拼接机房名称

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

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

                        GroupIndexInFBSDevice : i,    //fbs设备索引

                        BattGroupId : tempgroupid[i],                //电池组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(),                //标称容量

@@ -481,7 +541,7 @@
                        DisCurrMax : $("#DisCurrMax").val(),                //最大核容电流

                        station_phone : $("#station_phone").val(),            //基站号码

                                        

                        BattProducer : $("#battproducer"+i).val(),            //电池品牌

                        BattProducer : $("#battproducer"+i).find("option:selected").val(),            //电池品牌

                        BattModel : $(battModel).val(),                //电池型号

                        BattProductDate :  $("#startTestrecord").val(),        //电池生产日期

                        BattInUseDate :  $("#endTestrecord").val(),            //电池使用日期

@@ -493,7 +553,6 @@
            console.info(arr);

            return arr;

        }

		
    

</script> 

<script type="text/javascript">  

@@ -523,7 +582,7 @@
     }

     

     function editBatt(){//

         console.info(getUpdateArr());

         creatBattGroupId(addbattnum);

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

         console.info(temp);

         $.ajax({

@@ -553,9 +612,10 @@
    

      

   

   $('input:radio[name="battnum"]').click(function(){

   /* $('input:radio[name="battnum"]').click(function(){

         var $this=$(this)

             , $mon=$('#MonVolStd') ;

      // for(var i=0;i<addbattnum;i++)      
        if ($this.attr("checked")) { 

　　　　　　  if($this.val()==4){

               $mon.val("12");

@@ -566,7 +626,7 @@
             moncount = 24;

         }  

　　　　}

   });

   }); */

   

   /*function creatMonCapOpt(){

       var k,optionStr='',allString;

@@ -584,9 +644,15 @@
           i=0;

           //console.info(temp[index.binf.MonCapStd]);

       var battproducer = ["50","100","150","200","250","300","350","400","450","500","1000"];

      if(temp[index]){

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

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

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

                        selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';	
                   } 
           }

       }else{

           for(var i=0;i<battproducer.length;i++){	
                    selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';    

               } 

       }

@@ -623,20 +689,7 @@
      

          

   }*/

   function setMonVolStd(suoyin){

         for(var u=0;u<suoyin;u++){  
           var id='';  
          id='#MonCount'+u; 
          (function(u){

              var vol='#MonVolStd'+u;

              $(document).on("change", id, function () {

                     if($(this).find("option:selected").val()==4){$(vol).val(12);}

                     if($(this).find("option:selected").val()==24){$(vol).val(2);} 
              })

          })(u)

               

         }    
   }

    function setMonVolStd(index){

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

             var s='#MonVolStd'+i;

@@ -645,6 +698,7 @@
         

    }

  

  
    /* 操作成功 

   $('#changeSuc').popup('open');

       操作失败


 gx_tieta/WebRoot/mobil/control.html

@@ -358,11 +358,7 @@
                    alert(msg.signal);

                }

            },error:function(e){

                var model = {

                    code:0,

                    data:e,

                    msg:'通信失败'

                };

                alert("通讯失败");

            }                 

        });

    }


 gx_tieta/WebRoot/mobil/index.html

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

            </li>

            <li>

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

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

            </li>

            <li>

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

@@ -48,7 +48,7 @@
                <a href="map.html" target="_top" id="LocationCR" data-i18n="main.usermanagement">机房定位</a>

            </li> -->

             <li>

                <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">批准审批及验收</a>

                <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">bts安装审批和验收</a>

            </li>

            <!-- <li>

                <a href="batt-home-info.html" target="_top" data-i18n="main.usermanagement">机房信息</a>


 gx_tieta/WebRoot/mobil/voltageMbargraph.html

@@ -93,7 +93,13 @@
            </div>        

        </div>       

    </div>            

	
    <div data-role="main" class="ui-content">

             <div class="ui-grid-c">

                 <div class="ui-block-a">最大<span class="max">&nbsp;</span></div>

                 <div class="ui-block-b">最小<span class="min">&nbsp;</span></div>

                 <div class="ui-block-c">平均<span class="avg">&nbsp;</span></div>

                 <div class="ui-block-d">累加和<span class="leijiasum">&nbsp;</span></div>

             </div>

    <script type="text/javascript" src="mobilJs/echarts.js"></script>

    <script type="text/javascript">

    /* $('#alwaysRight').tap(function(){


 gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java

@@ -54,7 +54,7 @@
        Page page=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql=" SELECT FOUND_ROWS() number";

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt " +

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt,battgroup_float_vol,battgroup_float_curr,battgroup_register_code " +

                "  ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +

                " from db_app_sys.tb_app_bts_battgroup " +

                " left outer join db_battinf.tb_battinf  on db_app_sys.tb_app_bts_battgroup.dev_id=db_battinf.tb_battinf.fBSDeviceId " +

@@ -75,7 +75,7 @@
        }else{

            sql+=dev_idT;

        }

        String orderSql="  order by dev_id limit ?,? ";

        String orderSql="  order by dev_id,battgroup_index asc  limit ?,? ";

        sql+=orderSql;

        //System.out.println(sql);                                                    //"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationId()+"%","%"+binf.getStationName5()+"%",binf.getNum()

        List<App_bts_battgroup> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

@@ -89,6 +89,9 @@
                        abattgroup.setBattgroup_id(rs.getInt("battgroup_id"));

                        abattgroup.setBattgroup_index(rs.getInt("battgroup_index"));

                        abattgroup.setBattgroup_mon_cnt(rs.getInt("battgroup_mon_cnt"));

                        abattgroup.setBattgroup_float_vol(rs.getFloat("battgroup_float_vol"));

                        abattgroup.setBattgroup_float_curr(rs.getFloat("battgroup_float_curr"));

                        abattgroup.setBattgroup_register_code(rs.getString("battgroup_register_code"));

                        abattgroup.setStationId(rs.getString("stationId"));

                        abattgroup.setStationName(rs.getString("stationName"));

                        abattgroup.setStationName1(rs.getString("stationName1"));


 gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java

@@ -49,7 +49,7 @@
        Page page=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql=" SELECT FOUND_ROWS() number";

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +

                "  ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +

                " from db_app_sys.tb_app_bts_comm_task " +

                " left outer join db_battinf.tb_battinf  on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +

@@ -83,6 +83,7 @@
                        atask.setDev_id(rs.getInt("dev_id"));

                        atask.setThread_id(rs.getInt("thread_id"));

                        atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));

                        atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));

                        atask.setBattgroup_id1(rs.getInt("battgroup_id1"));

                        atask.setBattgroup_index1(rs.getInt("battgroup_index1"));

                        atask.setBattgroup_id2(rs.getInt("battgroup_id2"));


 gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java

@@ -8,6 +8,9 @@
    private int battgroup_id;

    private int battgroup_index;

    private int battgroup_mon_cnt;

    private float battgroup_float_vol;

    private float battgroup_float_curr;

    private String battgroup_register_code;

    private String stationName;

    private String stationName1;

    private String stationName2;

@@ -87,12 +90,32 @@
    public void setNote(String note) {

        this.note = note;

    }

    public float getBattgroup_float_vol() {

        return battgroup_float_vol;

    }

    public void setBattgroup_float_vol(float battgroup_float_vol) {

        this.battgroup_float_vol = battgroup_float_vol;

    }

    public float getBattgroup_float_curr() {

        return battgroup_float_curr;

    }

    public void setBattgroup_float_curr(float battgroup_float_curr) {

        this.battgroup_float_curr = battgroup_float_curr;

    }

    public String getBattgroup_register_code() {

        return battgroup_register_code;

    }

    public void setBattgroup_register_code(String battgroup_register_code) {

        this.battgroup_register_code = battgroup_register_code;

    }

    @Override

    public String toString() {

        return "App_bts_battgroup [num=" + num + ", dev_id=" + dev_id + ", battgroup_id=" + battgroup_id

                + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt + ", stationName="

                + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3="

                + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";

                + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt

                + ", battgroup_float_vol=" + battgroup_float_vol + ", battgroup_float_curr=" + battgroup_float_curr

                + ", battgroup_register_code=" + battgroup_register_code + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3

                + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";

    }



    


 gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java

@@ -7,6 +7,7 @@
    private int num;

    private int thread_id;

    private int dev_id;

    private String dev_mcu_uid;

    private int battgroup_cnt;

    private int battgroup_id1;

    private int battgroup_index1;

@@ -158,24 +159,26 @@
    public void setStationId(String stationId) {

        this.stationId = stationId;

    }

    public String getDev_mcu_uid() {

        return dev_mcu_uid;

    }

    public void setDev_mcu_uid(String dev_mcu_uid) {

        this.dev_mcu_uid = dev_mcu_uid;

    }

    @Override

    public String toString() {

        return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id

                + ", dev_id=" + dev_id + ", battgroup_cnt=" + battgroup_cnt

                + ", battgroup_id1=" + battgroup_id1 + ", battgroup_index1="

                + battgroup_index1 + ", battgroup_id2=" + battgroup_id2

                + ", battgroup_index2=" + battgroup_index2 + ", battgroup_id3="

                + battgroup_id3 + ", battgroup_index3=" + battgroup_index3

                + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4="

                + battgroup_index4 + ", connect_time=" + connet_time

                + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type="

                + break_type + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2="

                + stationName2 + ", stationName3=" + stationName3

                + ", stationName5=" + stationName5 + ", stationId=" + stationId

        return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id + ", dev_id=" + dev_id + ", dev_mcu_uid="

                + dev_mcu_uid + ", battgroup_cnt=" + battgroup_cnt + ", battgroup_id1=" + battgroup_id1

                + ", battgroup_index1=" + battgroup_index1 + ", battgroup_id2=" + battgroup_id2 + ", battgroup_index2="

                + battgroup_index2 + ", battgroup_id3=" + battgroup_id3 + ", battgroup_index3=" + battgroup_index3

                + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4=" + battgroup_index4 + ", connet_time="

                + connet_time + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type=" + break_type

                + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2

                + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId

                + ", note=" + note + "]";

    }

    

    





}


 gx_tieta/src/global_zh_CN.properties

@@ -1125,3 +1125,6 @@


##################  sys-set-test.jsp     ##############################

Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e


##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2