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

hdw

2018-12-29 f196bbea81977c5e0cf5906cba2609a547fd6a3b

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

 gx_tieta/.gitignore

File was deleted

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

@@ -1109,3 +1109,10 @@


###################  ex-battinfo.jsp   ##################################

Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279





##################  batch-set-curr.jsp  ##############################

Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5



##################  batt-station-update1.jsp   #########################

BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7

 gx_tieta/WebRoot/batt-station-update1.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>BTS设备升级</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">


 gx_tieta/WebRoot/js/buildNav.js

@@ -53,6 +53,7 @@
         

         //电池放电测试

         {permit_item_name:'batt_test_op_permit',num:58},    //电池放电测试

         {permit_item_name:'batt_test_op_permit',num:81},    //批量电池放电测试

         

         {permit_item_name:'batt_discharge_model_permit',num:59},        //设备充放电模块参数

         {permit_item_name:'batt_discharge_model_permit',num:63},        //电池信息配置

@@ -60,6 +61,8 @@
         {permit_item_name:'batt_discharge_model_permit',num:64},        //用户密码重置

         {permit_item_name:'batt_discharge_model_permit',num:65},        //班组管理

         {permit_item_name:'batt_discharge_model_permit',num:71},        //电池组配组管理

         {permit_item_name:'batt_discharge_model_permit',num:82},        //基站安装审批

         {permit_item_name:'batt_discharge_model_permit',num:83},        //BTS设备升级

         

         {permit_item_name:'batt_alm_param_query_permit',num:31}, // 电池告警参数设置

         {permit_item_name:'batt_alm_param_query_permit',num:66} // 设备告警参数设置


 gx_tieta/WebRoot/mobil/batt-approved1.html

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

        }

        .uncheck{

            background-color: #dddddde0!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%;

@@ -145,7 +145,7 @@
                                                <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />



                                        <tr>

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

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

                                            <td>

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

                                            </td>

@@ -264,15 +264,18 @@
    

    function battnumber(){

       var selected=''

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

               selected+= '<option '+'value='+i+'>'+"电池组"+i+'</option>';	
       console.info(temp);

       if(temp.length>0){

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

                   selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';	
       }

       return $('#newbattnum').html(selected); 

       }

      }    

        

   function creatBattView(index){

         var count=index+1

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

            ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupName+'</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>' 

@@ -315,8 +318,10 @@
    var arr = temp;

    

    function setcookieCreat(i){

        var index=Math.ceil(i-1);

        arrdata = temp[index].binf;

    console.info(temp);

    console.info(i)

        //var index=Math.ceil(i-1);

        arrdata = temp[i].binf;

        //console.info(index);

        //console.info(temp);

        console.info(arrdata);

@@ -376,7 +381,13 @@
        //setTimes($("#startTestrecord"),'2000-01-01');

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

        

		
        installstartdata(temp);

    diubao();

    timeer = window.setTimeout(function() {

            diubao();						
                        }, 4000);    //丢包率，通信计数，4秒刷新1次。

        //4秒刷新一次页面

    });

    

    function applyendyanshou(arr){   //申请验收

@@ -453,8 +464,7 @@
            //setTimes($("#startTestrecord"),data.productDate);

            //setTimes($("#endTestrecord"),data.useDate);

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

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

            document.getElementById("diubaonumber").value = getCookiediubao(data.StationId)

			
                

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

                data=temp[i];        

@@ -476,8 +486,15 @@
            }

    }

    

    function diubao(){

        if(temp.length>0){

            data=temp[0].binf;

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

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

        }	
    }

     function getCookienumber(id){//输入ID，返回通讯计数。数据从缓存获取。

         //var a = getnumber();

         var a = getnumber();

         //console.info(a);

         if(getCookie("numberget")){

             var number = getCookie("numberget");

@@ -493,6 +510,25 @@
         }

         return 0;

     }

     function getnumber(){     //向获取所有通讯计数并存入缓存

        $.ajax({

             type: 'post',

            async: true,

            url: 'Battinf_applyAction!devCommNum',

            data: null,

            dataType: 'json',

            success:function(data) {

                data = JSON.parse(data.result);

                if(data.code==1){

                    console.info(data.data);

                    var json =JSON.stringify(data.data);

                    setCookie("numberget",json);

                    //return data.data;	
                }

            }

        });

     }

	 
     function getCookiediubao(id){   //丢包率

         if(getCookie("numberget")){

             var number = getCookie("numberget");


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

@@ -95,8 +95,7 @@
                                        <tr>

                                            <td>机房名称</td>

                                            <td>

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

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

                                        </tr>

                                        

@@ -106,29 +105,17 @@
                                        

                                                <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,8 +131,6 @@
                                                    <label for="twentyfour">24个</label>

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

                                                  </fieldset>

											        
											    
                                                

                                            </td>

                                        </tr>

@@ -181,7 +166,7 @@
                                            

                                        

                                        <tr>

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

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

                                            <td>

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

                                            </td>

@@ -323,10 +308,6 @@
   

   });

 

    
   
   


    $(function () {

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

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

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

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

        

			
            var arr = new Array();

            

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

@@ -542,7 +522,13 @@
    });

     

     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(){//


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

@@ -33,10 +33,10 @@
            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%;

@@ -102,28 +102,21 @@
                                            </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" 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" />

                                            

@@ -161,7 +154,9 @@
                                        </tr> -->

                                        

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

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

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

                                        

                                        <tr>

@@ -182,6 +177,7 @@
                                        </tr>



                                            <input id="startTestrecord"  type="hidden" name="appDate" class="appDatefir"  value="2000-01-01 00:00:00" />

											
                                            <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec"  value="2017-01-01 00:00:00" />

                                            

                                        <tr>

@@ -236,18 +232,8 @@
            ,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()+'</select>'

@@ -582,7 +568,6 @@
        //setFloatAndoutLine();

    }

    



        function getUpdateArr(){

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

            var moncount = 0;

@@ -674,13 +659,13 @@
    });

     

     function nullOrn(){

     //    if($("#BattFloatCurrent").val()&&$("#MonCapStd").val()){

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

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

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

             return true;

         //}else{

             //alert("*项为必填项，不能为空，请重新输入");

             //return false;

     //    }	
 	
         }else{

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

         }

     }

     

     function addBattnew(){//新建电池组，添加到申请

@@ -710,23 +695,13 @@
   

   

   function creatMonCapOpt(suoyin){

        
       var k,optionStr='',allString;

       
       var k,optionStr='',allString   
        for(var i=1;i<11;i++){

        
          k=i*50;

          
           //optionStr+='<option'+' value='+k+'>'+k+'</option>';

          optionStr+='<option'+' value='+k+'>'+k+'</option>';

           
          
           
          }

        return  allString=optionStr+'<option'+' selected = selected '+' value='+1000+'>'+1000+'</option>';

           
      
        
   }

   

   function getRadioValue(na){

@@ -749,7 +724,6 @@
                     if($(this).find("option:selected").val()==24){$(vol).val(2);} 

              })

          })(u)

               
         }    

   }

   setchangedMonVolStd(suoyin);

@@ -758,7 +732,6 @@
             var s='#MonVolStd'+i;

             $(s).val(12);

          }

         
    }

   

    /* 操作成功 


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

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

        }

        .uncheck{

            background-color: #dddddde0!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%;

@@ -241,8 +241,9 @@
        });     

  }      

  function creatBattView(index){

          if(temp.length>0){

         var count=index+1

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

            ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupNamet+'</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>' 

@@ -258,6 +259,7 @@
            ,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 selectedNum(index){

      var selected='';

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


 gx_tieta/WebRoot/mobil/conductanceM.html

@@ -65,7 +65,7 @@
    <div data-role="page">

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

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

            <h1>电导</h1>	
            <h1 id="biaoti">电导</h1>	
            <div  data-role="collapsible"  data-type="horizontal"  class="ui-btn-right"  style="padding-bottom:-0.7em; padding-top:-0.7em;" >

                <h1 id="alwaysRight">更多</h1>

                <div class="clear" ></div>

@@ -89,9 +89,9 @@
        <div data-role="main" class="ui-content">

    

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

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

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

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

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

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

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

             </div>

            <table data-role="table" class="ui-responsive" data-mode="">

                  <thead>

@@ -146,6 +146,7 @@
         var temp=getCookie("batt");

         if(temp.length>0){

             var batt=eval("("+temp+")");     

             $("#biaoti").text("电导("+batt.BattGroupName+")");//标题添加电池组编号	 
            $.ajax({

              url : "Batt_rtdataAction_serchByCondition",

              async: true,


 gx_tieta/WebRoot/mobil/control.html

@@ -19,7 +19,7 @@
<div data-role="page">

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

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

        <h1>实时—检测数据</h1>

        <h1 id="biaoti">实时—检测数据</h1>

    </div>



    <div data-role="content">

@@ -46,7 +46,7 @@
            </li> -->

        </ul>

        <div data-role="collapsible" data-collapsed="false">

          <h1>电池组状态</h1>

          <h1 id="zhuangtai">电池组状态</h1>

          <div class="tbl-container"></div>

        </div>

    </div>

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

                            arrTd.push("------");

                        }

						
                        $("#zhuangtai").find("a").text("电池组状态("+batt.BattGroupName+")");

                        createTbl(tbl, arrTh, arrTd);                

                        window.clearTimeout(timeer);

                        timeer = window.setTimeout(function() {


 gx_tieta/WebRoot/mobil/iframe/homeinfo1.html

@@ -109,7 +109,7 @@
                                    </div>

                                </div>

                                <div class="layui-col-12 t-align-right mrt5">

                                    <button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">视频上传</button>

                                    <span style="color: #FF0000;" class="mrr4">请上传微信拍摄的视频</span><button class="layui-btn layui-btn-normal layui-btn-sm" id="uploadVideo">视频上传</button>

                                </div>

                            </div>

                        </div>


 gx_tieta/WebRoot/mobil/internalresistanceM.html

@@ -56,7 +56,7 @@
    <div data-role="page">

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

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

            <h1>内阻</h1>

            <h1 id="biaoti">内阻</h1>

    

            <div  data-role="collapsible"  data-type="horizontal"  class="ui-btn-right"  style="padding-bottom:-0.7em; padding-top:-0.7em;" >

                    <h1 id="alwaysRight">更多</h1>

@@ -81,9 +81,9 @@
                       

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

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

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

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

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

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

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

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

             </div>

              <table data-role="table" data-mode="" class="ui-responsive"  id="myTable">

                    <thead>

@@ -138,6 +138,7 @@
         if(temp.length>0){

             var batt=eval("("+temp+")");

             //console.info(batt);

             $("#biaoti").text("内阻("+batt.BattGroupName+")");//标题添加电池组编号

             $.ajax({

                url : "Batt_rtdataAction_serchByCondition",

                async: true,


 gx_tieta/WebRoot/mobil/temperatureM.html

@@ -56,7 +56,7 @@
    <div data-role="page">

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

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

            <h1>温度</h1>	
            <h1 id="biaoti">温度</h1>	
            <div  data-role="collapsible"  data-type="horizontal"  class="ui-btn-right"  style="padding-bottom:-0.7em; padding-top:-0.7em;" >

                <h1 id="alwaysRight">更多</h1>

                <h1 class="full-width">

@@ -79,9 +79,9 @@
        <div data-role="main" class="ui-content">

    

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

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

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

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

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

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

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

             </div>

            <table data-role="table" class="ui-responsive" data-mode="">

                  <thead>

@@ -171,6 +171,7 @@
         if(temp.length>0){

             var batt=eval("("+temp+")");

             //console.info(batt);

             $("#biaoti").text("温度("+batt.BattGroupName+")");//标题添加电池组编号

             $.ajax({

                url : "Batt_rtdataAction_serchByCondition",

                async: true,


 gx_tieta/WebRoot/mobil/voltageM.html

@@ -49,6 +49,13 @@
        height:1px;

        clear:both;

    }

    .ui-grid-c>.ui-block-a, .ui-grid-c>.ui-block-b, .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {

    width: 20%;

    font-size: 0.9em;

    }

    .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {

    width:30%;

    }

</style>





@@ -57,7 +64,7 @@
    <div data-role="page">

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

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

            <h1>电压</h1>

            <h1 id="biaoti">电压</h1>

    

            <div  data-role="collapsible"  data-type="horizontal"  class="ui-btn-right"  style="padding-bottom:-0.7em; padding-top:-0.7em;" >

                <h1 id="alwaysRight">更多</h1>

@@ -80,10 +87,11 @@
        </div>

                       

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

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

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

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

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

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

              <table data-role="table" data-mode="" class="ui-responsive"  id="myTable">

                    <thead>

@@ -135,8 +143,10 @@
     

     function findtmp(){

         var temp=getCookie("batt");

         console.info(temp);

         if(temp.length>0){

             var batt=eval("("+temp+")");

             $("#biaoti").text("电压("+batt.BattGroupName+")");//标题添加电池组编号

             //console.info(batt);

             $.ajax({

                url : "Batt_rtdataAction_serchByCondition",

@@ -215,6 +225,7 @@
    function createCount(datas){

        var temp=new Array();

        var sum=0;

        console.info(datas);

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

            temp.push((datas[i].mon_vol).toFixed(3));

            sum+=parseFloat(temp[i]);

@@ -222,11 +233,11 @@
        var max=Math.max.apply(null, temp);

        var min=Math.min.apply(null, temp);

        var avg=(sum/temp.length).toFixed(3);

	 
	      
        sum=(sum).toFixed(2); 
        $(".max").text(max+'V');

        $(".min").text(min+'V');

        $(".avg").text(avg+'V');     

        $(".leijiasum").text(sum+'V');    
    } 

    

    function isMax(datas,flag){


 gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java

@@ -77,6 +77,7 @@
             {"taskchange_query_permit","37"},    //作业变更查询

             

             {"batt_test_op_permit","58"},    //电池放电测试

             {"batt_test_op_permit","81"},    //批量电池放电测试

             

             //超级管理员界面

             {"batt_discharge_model_permit","59"},    //设备充放电模块参数

@@ -85,6 +86,8 @@
             {"batt_discharge_model_permit","64"},    //用户密码重置

             {"batt_discharge_model_permit","65"},    //班组管理

             {"batt_discharge_model_permit","71"},    //电池组配组管理

             {"batt_discharge_model_permit","82"},    //基站安装审批

             {"batt_discharge_model_permit","83"},    //BTS设备升级

             

             {"batt_alm_param_query_permit","31"},        //告警参数设置

             {"batt_alm_param_query_permit","66"},        //设备告警参数设置


 gx_tieta/src/global_zh_CN.properties

@@ -1109,3 +1109,10 @@


###################  ex-battinfo.jsp   ##################################

Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279





##################  batch-set-curr.jsp  ##############################

Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5



##################  batt-station-update1.jsp   #########################

BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7