81041
2019-01-08 de072c451bdf8b49efea074e86d129e043e9df6b
Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
4个文件已添加
15个文件已修改
825 ■■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/bat-set-test.jsp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batch-set-curr.jsp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-apprvedAccept-index.html 233 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ex-battinfo.jsp 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/buildNav.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/approvalBatt-index.html 233 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/approvalBatt.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-approve-index.html 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-approved.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-approved1.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-unapproved-index.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/checkAccept-index.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/index.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/power.jsp 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/global_zh_CN.properties 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1111,7 +1111,8 @@
###################  ex-battinfo.jsp   ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
Audit = \u5ba1\u6838
Acceptance = \u9a8c\u6536
##################  batch-set-curr.jsp  ##############################
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
gx_tieta/WebRoot/bat-set-test.jsp
@@ -707,15 +707,15 @@
                
                // 处理添加机房信息的结果
                function formatSearchData(data) {
                    console.log(data);
                    var rs = [];
                    // 遍历data的
                    for(var i=0; i<data.length; i++) {
                        var _data = data[i];
                        if(!_data.obj) {
                            continue;
                        }
                        var obj = _data.obj[0];
                        var tmp = {};
                        tmp.num = _data.num;                        // 判断是否读取成功
                        tmp.key_id = i;
                        tmp.dev_id = obj.dev_id;                    // 设备ID
                        tmp.dev_ip = obj.dev_ip;                    // 设备IP
gx_tieta/WebRoot/batch-set-curr.jsp
@@ -813,9 +813,11 @@
                                }
                                
                                var trIndex = getSetCurrIndex(data, tOptions.data);
                                //console.log(trIndex);
                                // 被设置参数的机房
                                for(var i=0; i<trIndex.length; i++) {
                                    var _data = data[i];
                                    console.log(_data);
                                    var _trIndex = trIndex[i];
                                    var _temp = {'doThings':''};
                                    if(_data.num==1) {
@@ -1059,12 +1061,14 @@
                    for(var i=0; i<setData.length; i++) {
                        var _setData = setData[i];
                        var setDevId = _setData.dev_id;
                        //console.log(setDevId);
                        // 遍历allData
                        for(var k=0; k<allData.length; k++) {
                            var _allData = allData[i];
                            var _allData = allData[k];
                            var allDevId = _allData.FBSDeviceId;
                            if(setDevId == allDevId) {
                                rs.push(k);
                                break;
                            }
                        }
                        
gx_tieta/WebRoot/batt-apprvedAccept-index.html
New file
@@ -0,0 +1,233 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
<link rel="stylesheet" href="css/breadcrumb.css">
<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
</head>
    <body>
        <div data-role="page"  tabindex="0" id="page0">
            <div data-role="header" data-position="fixed">
                <a href="index.html"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <h1>待审批列表</h1>
            </div>
            <div data-role="content">
                <ul class="breadcrumb"></ul>
                <div id="battList"></div>
            </div>
            <div data-role="popup" id="myPopup" class="defined-popup">
                    <div class="popup-container">
                        <div class="popup-title">查询数据失败</div>
                        <div class="popup-content">
                            <div class="set-option">
                                <p>请设置包机组</p>
                            </div>
                        </div>
                        <div class="popup-footer">
                            <div class="footer-float footer-left">
                                <button type="button" id="right" data-mini="true" style="visibility: hidden;">确定</button>
                            </div>
                            <div class="footer-float footer-right">
                                <button type="button" id="hidePopup" data-mini="true">取消</button>
                            </div>
                        </div>
                    </div>
                </div>
            <div data-role="footer" data-position="fixed">
                <!-- <h1>福光电子有限公司</h1> -->
            </div>
        </div>
    </body>
    <script type="text/javascript" src="js/battNav.js"></script>
    <script type="text/javascript">
        var stationlist = new Array();
        // 初始化页面内容
        $(document).ready(function(){
            setCookie("station",null);
            setCookie("batt",null);
            searchBattLife();
        });
        // 点击机房事件
        $(function () {
            var aLi = -1;
            $('#battList').on('click', 'ul li', function () {
                aLi = $(this).index();
                console.info(aLi);
                station = getbatt(stationlist,aLi);
                var arr=setarrbatt(arrdata,station);
                console.info(arr);
                window.location.href="batt-approved1.html";
            });
        });
        var arrTd = new Array();
        var arrdata = new Array();
        var Page = {
            pageSize:20,                 //每页的行数
            pageCurr:1,                  //当前页码数
            pageAll:0,
        };
        function getcreatArr(){
            obj = {
                apply_en :0,
                check_en:100,
                binf : {
                    page:Page,
                }
            }
            return obj;
        }
        // 查询内容
        function searchBattLife(){
            var temp = JSON.stringify(getcreatArr());
            console.info(temp);
            arrTd = new Array();
             var index = 0;
             $.ajax({
                 type: 'post',
                async: true,
                url: 'Battinf_applyAction!serchByCondition',
                data: "json="+temp,
                dataType: 'json',
                success:function(data) {
                console.info(data);
                     data = JSON.parse(data.result);
                     if(data.code!=0&&data.data.length>0){
                         data=data.data
                         var model = new Array();
                         console.info(data);
                         for(var i=0;i<data.length;i++){
                             if(data[i].check_en!=1){
                                 arrdata.push(data[i]);//存储数据
                                 if(model.length==0){
                                     model.push(data[i].binf.StationName);
                                 }else{
                                     if(model[model.length-1]!=data[i].binf.StationName){//若不重复,则PUSH进去
                                         model.push(data[i].binf.StationName);
                                     }
                                 }
                                 console.info(model);
                                 stationlist=model;
                             }
                         }
                         createUl($('#battList'),model);
                     }
                 }
             });
         }
         function setarrbatt(arrdata,station){
             console.info(arrdata);
            if(arrdata.length>0){   //存入的为所有已查出数据
                var arr= creatYanshouObj(arrdata,station);//申请验收方法。
                return arr;
            }else{
                alert("请等待几秒后再提交申请");
            }
        }
         function creatYanshouObj(arrdata,station){          //通过点击机房信息(stationid),获取该机房电池组
            //var StationId = arrdata[index].binf.StationId;
            //console.info(StationId);
            var arr = new Array(); //初始化传参数组
            console.info(station);
            console.info(arrdata);
            for(var i=0;i<arrdata.length;i++){//一次验收该机房下的所有电池组构建对象 。
                if(station == arrdata[i].binf.StationName){
                    var obj = {
                        num :arrdata[i].num,
                        check_en:arrdata[i].check_en,
                        binf:{
                            StationId : arrdata[i].binf.StationId,    // 机房编号
                            StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),    // 拼接机房名称
                            StationName1 :arrdata[i].binf.StationName1,        // 省
                            StationName2 : arrdata[i].binf.StationName2,        // 市
                            StationName5 :  arrdata[i].binf.StationName5,        // 区/县
                            StationName3 :  arrdata[i].binf.StationName3,        // 机房名称
                            StationName4 : arrdata[i].binf.StationName4,        // 设备名称
                            StationIp :arrdata[i].binf.StationIp,                //机房ip
                            FBSDeviceId : arrdata[i].binf.FBSDeviceId,                //设备id
                            FbsDeviceIp : arrdata[i].binf.FbsDeviceIp,                //设备ip
                            FbsDeviceIp_YM :  arrdata[i].binf.FbsDeviceIp_YM,            // 设备掩码
                            FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG ,            // 网关
                            FBSDeviceName : arrdata[i].binf.FBSDeviceName,            //设备名称
                            GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice,    //fbs设备索引
                            BattGroupId : arrdata[i].binf.BattGroupId,                //电池组id
                            BattGroupNum : arrdata[i].binf.BattGroupNum ,            //机房内电池组编号
                            BattGroupName :arrdata[i].binf.BattGroupName,        //电池组索引
                            FloatVolLevel : arrdata[i].binf.FloatVolLevel,            //浮充电压阀值
                            OfflineVolLevel : arrdata[i].binf.OfflineVolLevel,            //离线电压阀值
                            BattFloatCurrent : arrdata[i].binf.BattFloatCurrent,        //浮充电流阀值
                            MonCount : arrdata[i].binf.MonCount,                //单体数量
                            MonCapStd : arrdata[i].binf.MonCapStd,                //标称容量
                            MonVolStd : arrdata[i].binf.MonVolStd,                //标称电压
                            MonResStd : arrdata[i].binf.MonResStd,                //标称内阻
                            MonSerStd : arrdata[i].binf.MonSerStd,                //标称电导
                            MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg,            //单体电压次低偏移量
                            Load_curr : arrdata[i].binf.Load_curr,                //负载电流
                            DisCurrMax : arrdata[i].binf.DisCurrMax,                //最大核容电流
                            station_phone : arrdata[i].binf.station_phone,            //基站号码
                            BattProducer : arrdata[i].binf.BattProducer,            //电池品牌
                            BattModel : arrdata[i].binf.BattModel,                //电池型号
                            BattProductDate :  arrdata[i].binf.BattProductDate,        //电池生产日期
                            BattInUseDate :  arrdata[i].binf.BattInUseDate,            //电池使用日期
                            install_user : arrdata[i].binf.install_user,            //安装人员
                        }
                    }
                    arr.push(obj);
                }
            }
            console.info(arr);
            //applyendyanshou(arr);//申请验收方法。
            var json=window.JSON.stringify(arr);
               setCookie("eleparm1",json);  //这里setcookie,若有上一条cookie则清空上一笔
            return arr;
        }
         function createUl(ulCon, dataList) {
            //console.info(index);
            // 清理容器下的ul
            ulCon.find('ul').remove();
            // 创建ul
            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
            // 遍历dataList生成li和a
            for (var i = 0; i < dataList.length; i++){
                var _li = $('<li></li');
                var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
                // 将_a添加到_li,将_li添加到_ul中
                _li.append(_a);
                _ul.append(_li);
            }
            // 将_ul添加到容器中
            ulCon.append(_ul).trigger('create');
            loadclose();
        }
        //获取当前选中的batt
        function getbatt(arr,index){
            if(arr.length>index){
                return arr[index];
            }
            return undefined;
        };
    </script>
</html>
gx_tieta/WebRoot/ex-battinfo.jsp
@@ -139,6 +139,13 @@
        <script type="text/javascript" src="pages/js/common.js"></script>
        <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
        <script type="text/javascript">
            var permits;
            <%    Object obj=session.getAttribute("permits");
                if(obj!=null){
                    String permits =obj.toString();  %>
                    permits=<%=permits%>;
                    //console.info(json);
            <%    }    %>
            layui.use(['form', 'table', 'layer', 'element'], function() {
                /* 页面导入layui模块 */
                var table = layui.table;        // 获取表格模块
@@ -248,6 +255,9 @@
                // 生成表格数据
                table.render(tOptions);
                
                // 检测是否可以审核权限
                var apprPermit = isHasPermit('install_appr_permit', permits);
                changeApprTbl(apprPermit, tOptions);
                
                // 待验收的表格 
                var acceptOptions = {
@@ -310,6 +320,9 @@
                // 生成表格数据
                table.render(acceptOptions);
                
                // 检测验收的权限
                var checkPermit = isHasPermit('install_check_permit', permits);
                changeCheckTbl(checkPermit, acceptOptions);
                
                // 待验收的表格 
                var acceptedOptions = {
@@ -663,9 +676,10 @@
                }
                
                // 更新审查表格
                var updateSearchTimer;
                function updateSearch() {
                    var temp = createSearchParam();
                    clearInterval(updateSearch.timer);
                    clearInterval(updateSearchTimer);
                    // 查询后台
                    $.ajax({
                        type: 'post'
@@ -686,8 +700,8 @@
                                for(var i=0; i<data.length; i++) {
                                    var _data = data[i];
                                    var _tmp = formaterResData(_data);
                                    if(_data.apply_note &&_data.apply_note != Page.all) {
                                        resData.push(_tmp);
                                    if(_data.apply_note &&_data.apply_note != Page.all) {
                                        Page.setAll(_data.apply_note);
                                        isUpdateTbl = true;
                                    }
@@ -704,7 +718,7 @@
                            }
                            // console.log(456);
                            // 实时回调
                            updateSearch.timer = setTimeout(updateSearch, 4000);
                            updateSearchTimer = setTimeout(updateSearch, 4000);
                        }
                    });
                }
@@ -824,9 +838,10 @@
                }
                
                // 更新验收表格
                var updateAcceptSearchTimer;
                function updateAcceptSearch() {
                    var temp = acceptSearchParam();
                    clearInterval(updateAcceptSearch.timer);
                    clearInterval(updateAcceptSearchTimer);
                    // 查询后台
                    $.ajax({
                        type: 'post'
@@ -850,7 +865,7 @@
                            }else {
                                acceptPage.setAll(0);
                            }
                            layuiTbl.setCache(table.cache.acceptTbl);
                            // 遍历data的值更新数据
                            for(var i=0; i<resData.length; i++) {
                                var _resData = resData[i];
@@ -859,7 +874,7 @@
                            }
                            //console.log(123);
                            // 实时回调
                            updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
                            updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
                        }
                    });
                }
@@ -898,6 +913,27 @@
                    
                    return num;
                }
                // 修改审批表格样式
                function changeApprTbl(bool, opts) {
                    var col = opts.cols[0];
                    var doThings = col[col.length-1];
                    // 移除审批按钮
                    if(!bool) {
                        col.length = col.length-1;
                    }
                }
                // 修改验收表格样式
                function changeCheckTbl(bool, opts) {
                    var col = opts.cols[0];
                    var doThings = col[col.length-1];
                    // 移除审批按钮
                    if(!bool) {
                        doThings.width = 200;
                        doThings.toolbar = '#acceptedBattGroupTools';
                    }
                }
            });
        </script>
    </body>
gx_tieta/WebRoot/js/buildNav.js
@@ -61,7 +61,7 @@
         {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:'install_look_permit',num:82},        //基站安装审批
         {permit_item_name:'batt_discharge_model_permit',num:83},        //BTS设备升级
         
         {permit_item_name:'batt_alm_param_query_permit',num:31}, // 电池告警参数设置
@@ -76,7 +76,7 @@
          'server_param_query_permit','batt_alm_query_permit',
          'dev_alm_query_permit','battfault_query_permit','usrtaskcheck_query_permit',
          'taskchange_query_permit','batt_discharge_model_permit',
          'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit'
          'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit'
      ];
gx_tieta/WebRoot/mobil/approvalBatt-index.html
New file
@@ -0,0 +1,233 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
<link rel="stylesheet" href="css/breadcrumb.css">
<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
</head>
    <body>
        <div data-role="page"  tabindex="0" id="page0">
            <div data-role="header" data-position="fixed">
                <a href="index.html"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">返回</a>
                <h1>已审批通过机房列表</h1>
            </div>
            <div data-role="content">
                <ul class="breadcrumb"></ul>
                <div id="battList"></div>
            </div>
            <div data-role="popup" id="myPopup" class="defined-popup">
                    <div class="popup-container">
                        <div class="popup-title">查询数据失败</div>
                        <div class="popup-content">
                            <div class="set-option">
                                <p>请设置包机组</p>
                            </div>
                        </div>
                        <div class="popup-footer">
                            <div class="footer-float footer-left">
                                <button type="button" id="right" data-mini="true" style="visibility: hidden;">确定</button>
                            </div>
                            <div class="footer-float footer-right">
                                <button type="button" id="hidePopup" data-mini="true">取消</button>
                            </div>
                        </div>
                    </div>
                </div>
            <div data-role="footer" data-position="fixed">
                <!-- <h1>福光电子有限公司</h1> -->
            </div>
        </div>
    </body>
    <script type="text/javascript" src="js/battNav.js"></script>
    <script type="text/javascript">
        var stationlist = new Array();
        // 初始化页面内容
        $(document).ready(function(){
            setCookie("station",null);
            setCookie("batt",null);
            searchBattLife();
        });
        // 点击机房事件
        $(function () {
            var aLi = -1;
            $('#battList').on('click', 'ul li', function () {
                aLi = $(this).index();
                console.info(aLi);
                station = getbatt(stationlist,aLi);
                var arr=setarrbatt(arrdata,station);
                console.info(arr);
                window.location.href="batt-approved1.html";
            });
        });
        var arrTd = new Array();
        var arrdata = new Array();
        var Page = {
            pageSize:20,                 //每页的行数
            pageCurr:1,                  //当前页码数
            pageAll:0,
        };
        function getcreatArr(){
            obj = {
                apply_en : 1,
                binf : {
                    page:Page,
                }
            }
            return obj;
        }
        // 查询内容
        function searchBattLife(){
            var temp = JSON.stringify(getcreatArr());
            console.info(temp);
            arrTd = new Array();
             var index = 0;
             $.ajax({
                 type: 'post',
                async: true,
                url: 'Battinf_applyAction!serchByInfo',
                data: "json="+temp,
                dataType: 'json',
                success:function(data) {
                     data = JSON.parse(data.result);
                     if(data.code!=0&&data.data.length>0){
                         data=data.data
                         var model = new Array();
                         console.info(data);
                         for(var i=0;i<data.length;i++){
                             if(data[i].check_en!=1){
                                 arrdata.push(data[i]);//存储数据
                                 if(model.length==0){
                                     model.push(data[i].binf.StationName);
                                 }else{
                                     if(model[model.length-1]!=data[i].binf.StationName){//若不重复,则PUSH进去
                                         model.push(data[i].binf.StationName);
                                     }
                                 }
                                 console.info(model);
                                 stationlist=model;
                             }
                         }
                         createUl($('#battList'),model);
                     }
                 }
             });
         }
         function setarrbatt(arrdata,station){
             console.info(arrdata);
            if(arrdata.length>0){   //存入的为所有已查出数据
                var arr= creatYanshouObj(arrdata,station);//申请验收方法。
                return arr;
            }else{
                alert("请等待几秒后再提交申请");
            }
        }
         function creatYanshouObj(arrdata,station){          //通过点击机房信息(stationid),获取该机房电池组
            //var StationId = arrdata[index].binf.StationId;
            //console.info(StationId);
            var arr = new Array(); //初始化传参数组
            console.info(station);
            console.info(arrdata);
            for(var i=0;i<arrdata.length;i++){//一次验收该机房下的所有电池组构建对象 。
                if(station == arrdata[i].binf.StationName){
                    var obj = {
                        num :arrdata[i].num,
                        check_en:arrdata[i].check_en,
                        binf:{
                            StationId : arrdata[i].binf.StationId,    // 机房编号
                            StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),    // 拼接机房名称
                            StationName1 :arrdata[i].binf.StationName1,        // 省
                            StationName2 : arrdata[i].binf.StationName2,        // 市
                            StationName5 :  arrdata[i].binf.StationName5,        // 区/县
                            StationName3 :  arrdata[i].binf.StationName3,        // 机房名称
                            StationName4 : arrdata[i].binf.StationName4,        // 设备名称
                            StationIp :arrdata[i].binf.StationIp,                //机房ip
                            FBSDeviceId : arrdata[i].binf.FBSDeviceId,                //设备id
                            FbsDeviceIp : arrdata[i].binf.FbsDeviceIp,                //设备ip
                            FbsDeviceIp_YM :  arrdata[i].binf.FbsDeviceIp_YM,            // 设备掩码
                            FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG ,            // 网关
                            FBSDeviceName : arrdata[i].binf.FBSDeviceName,            //设备名称
                            GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice,    //fbs设备索引
                            BattGroupId : arrdata[i].binf.BattGroupId,                //电池组id
                            BattGroupNum : arrdata[i].binf.BattGroupNum ,            //机房内电池组编号
                            BattGroupName :arrdata[i].binf.BattGroupName,        //电池组索引
                            FloatVolLevel : arrdata[i].binf.FloatVolLevel,            //浮充电压阀值
                            OfflineVolLevel : arrdata[i].binf.OfflineVolLevel,            //离线电压阀值
                            BattFloatCurrent : arrdata[i].binf.BattFloatCurrent,        //浮充电流阀值
                            MonCount : arrdata[i].binf.MonCount,                //单体数量
                            MonCapStd : arrdata[i].binf.MonCapStd,                //标称容量
                            MonVolStd : arrdata[i].binf.MonVolStd,                //标称电压
                            MonResStd : arrdata[i].binf.MonResStd,                //标称内阻
                            MonSerStd : arrdata[i].binf.MonSerStd,                //标称电导
                            MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg,            //单体电压次低偏移量
                            Load_curr : arrdata[i].binf.Load_curr,                //负载电流
                            DisCurrMax : arrdata[i].binf.DisCurrMax,                //最大核容电流
                            station_phone : arrdata[i].binf.station_phone,            //基站号码
                            BattProducer : arrdata[i].binf.BattProducer,            //电池品牌
                            BattModel : arrdata[i].binf.BattModel,                //电池型号
                            BattProductDate :  arrdata[i].binf.BattProductDate,        //电池生产日期
                            BattInUseDate :  arrdata[i].binf.BattInUseDate,            //电池使用日期
                            install_user : arrdata[i].binf.install_user,            //安装人员
                        }
                    }
                    arr.push(obj);
                }
            }
            console.info(arr);
            //applyendyanshou(arr);//申请验收方法。
            var json=window.JSON.stringify(arr);
               setCookie("eleparm1",json);  //这里setcookie,若有上一条cookie则清空上一笔
            return arr;
        }
         function createUl(ulCon, dataList) {
            //console.info(index);
            // 清理容器下的ul
            ulCon.find('ul').remove();
            // 创建ul
            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
            // 遍历dataList生成li和a
            for (var i = 0; i < dataList.length; i++){
                var _li = $('<li></li');
                var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
                // 将_a添加到_li,将_li添加到_ul中
                _li.append(_a);
                _ul.append(_li);
            }
            // 将_ul添加到容器中
            ulCon.append(_ul).trigger('create');
            loadclose();
        }
        //获取当前选中的batt
        function getbatt(arr,index){
            if(arr.length>index){
                return arr[index];
            }
            return undefined;
        };
    </script>
</html>
gx_tieta/WebRoot/mobil/approvalBatt.html
New file
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
</body>
</html>
gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -45,6 +45,16 @@
            </div>
        </div>
    </body>
    <div data-role="main" class="ui-content">
            <div class="tbl-container"></div>
    </div>
    <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
    <script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
    <script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
    <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
    <script type="text/javascript" src="js/tbl.js"></script>
    <script type="text/javascript" src="js/panel.js"></script>
    <script type="text/javascript" src="mobilJs/base.js"></script>
    <script type="text/javascript" src="js/battNav.js"></script>
    <script type="text/javascript">
        var stationlist = new Array();
@@ -54,7 +64,7 @@
            setCookie("station",null);
            setCookie("batt",null);
            searchBattLife();
            getnumber();//查询所有的通讯技术并放入缓存。
        });
        
        // 点击机房事件
@@ -70,6 +80,24 @@
            });        
        });
        
        // 监测页面滚动到文档的底部
        $(document).on('scrollstop', function() {
            var tblCont = $('.tbl-container');
            var loading = $('.ui-loading');
            var scrollTop = $(this).scrollTop();
            var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
            //console.info(pageNum);
            if(loading.length == 0 ) {
                var winHt = $(window).height();
                var docHt = $(this).height();
                var shiftHt = docHt - winHt;
                if(shiftHt < scrollTop || shiftHt == scrollTop) {
                    Page.pageCurr++;
                    searchBattLife();
                }
            }
        });
        var arrTd = new Array();
        var arrdata = new Array();
        
@@ -82,30 +110,14 @@
        function getcreatArr(){
            obj = {
                apply_en : 1,
                check_en:0,
                binf : {
                    page:Page,                       
                }
            }
            return obj;
        }
        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 searchBattLife(){
            var temp = JSON.stringify(getcreatArr());
@@ -119,13 +131,14 @@
                data: "json="+temp,
                dataType: 'json',
                success:function(data) {
                    console.info(data);
                     data = JSON.parse(data.result);
                     if(data.code!=0&&data.data.length>0){
                         data=data.data
                         var model = new Array();
                         console.info(data);
                         for(var i=0;i<data.length;i++){
                             if(data[i].check_en!=1){
                             //if(data[i].check_en!=1){
                                 arrdata.push(data[i]);//存储数据
                                 if(model.length==0){
                                     model.push(data[i].binf.StationName);
@@ -136,9 +149,13 @@
                                 }
                                 console.info(model);
                                 stationlist=model;
                         //    }
                             }
                         }
                         if(Page.pageCurr==1){
                         createUl($('#battList'),model);
                         }else{
                             addUl($('#battList'),model);
                         }
                     }
                 }
             });             
@@ -237,6 +254,26 @@
            ulCon.append(_ul).trigger('create');            
            loadclose();
        }
        function addUl(ulCon, dataList) {
            // 创建ul
            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
            // 遍历dataList生成li和a
            for (var i = 0; i < dataList.length; i++){
                var _li = $('<li></li');
                var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
                // 将_a添加到_li,将_li添加到_ul中
                _li.append(_a);
                _ul.append(_li);
            }
            // 将_ul添加到容器中
            ulCon.append(_ul).trigger('create');
            loadclose();
        }
        
        //获取当前选中的batt
        function getbatt(arr,index){
gx_tieta/WebRoot/mobil/batt-approved.html
@@ -269,8 +269,8 @@
                     if(id == number[i].dev_id){
                         var errorCount = number[i].dev_errcommcount;
                         var allCount = number[i].dev_commcount+errorCount;
                         var parcent = (allCount==0?0:errCount/allCount*100)
                         return parcent;
                         //var parcent = (allCount==0?0:errCount/allCount*100)
                         //return parcent;
                     }
                 }    
             }
gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -89,7 +89,7 @@
                                        <tr>
                                            <td>机房名称</td>
                                            <td>
                                                <input type="text" id="homeName"  class="unable" data-mini="true">
                                                <textarea id="homeName" class="unable" data-mini="true"></textarea>
                                            </td>
                                        </tr>
                                        <tr>    
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -41,6 +41,7 @@
        .ui-select .ui-btn select{
            width:77%;
        }
        table tr td{width:1000em;padding-right:1em;}
    </style>
    <link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -97,8 +98,7 @@
                                        <tr>
                                            <td>*机房名称</td>
                                            <td>
                                                <input type="text" id="homeName"  data-mini="true">
                                                <textarea id="homeName"  data-mini="true"></textarea>
                                            </td>
                                        </tr>
    
@@ -174,6 +174,7 @@
                                        </tr>
                                        
                                                <input type="hidden" id="DisCurrMax" data-mini="true" />
                                                <input type="hidden" id="judgeBatt" data-mini="true" />
                                            
                                        
                                        <tr>
@@ -415,9 +416,6 @@
   
    $(function () {
        //setTimes($("#startTestrecord"),'2000-01-01');
        //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
        //creatgroupid();//如果检测为NEW ,则执行添加ID,如果为修改,则执行为拿到ID;
        installstartdata(temp);
    });
@@ -651,12 +649,10 @@
        $("#sure").click(function(){
            if(nullOrn()){    
                creatgroupid();//提交之前再次验证,创建ID
                addBattnew();     //提交
                JudegeBattIn();//提交前验证该电池组在BATTINF表中是否已存在
                //addBattnew();     //提交
            }else{
            }                //验证重要项是否为空,为空则提示;   
               //function backpage(){window.location.href="ele-param1.html";}
             // setTimeout(backpage,500);
        });
        $("#cancel").click(function(){
            window.location.href="ele-param2.html";
@@ -673,6 +669,29 @@
         }
     }
     
     function JudegeBattIn(){
         var battinff ={
            StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()),    // 拼接机房名称
         }
         console.info(battinff);
         $.ajax({
             type: 'post',
            async: true,
            url: '../BattInfAction!judgeBatt',
            data: "json="+JSON.stringify(battinff),
            dataType: 'json',
            success:function(data) {
                data = JSON.parse(data.result);
                console.info(data);
                if(data.code!=1){
                    addBattnew()
                }else{
                    alert("该机房已存在,请返回上一页搜索框修改");
                }
            }
        });
     }
     function addBattnew(){//新建电池组,添加到申请
     console.info(getUpdateArr());
         var temp = JSON.stringify(getUpdateArr());
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -92,8 +92,7 @@
                                        <tr>
                                            <td>机房名称</td>
                                            <td>
                                                <input type="text"  class="unable" class="unable"  id="homeName"  data-mini="true">
                                                <textarea id="homeName" class="unable" data-mini="true"></textarea>
                                            </td>
                                        </tr>
                                        
gx_tieta/WebRoot/mobil/batt-unapproved-index.html
@@ -83,6 +83,7 @@
        function getcreatArr(){
            obj = {
                apply_en : 0,
                check_en:0,
                binf : {
                    page:Page,                       
                }
@@ -103,6 +104,7 @@
                dataType: 'json',
                success:function(data) {
                     data = JSON.parse(data.result);
                     console.info(data);
                     if(data.code!=0&&data.data.length>0){
                         data=data.data
                         var model = new Array();
@@ -119,13 +121,60 @@
                             console.info(model);
                             stationlist=model;
                         }
                         if(Page.pageCurr==1){
                         createUl($('#battList'),model);
                         }else{
                             addUl($('#battList'),model);
                         }
                     }
                 
                 }
             });             
         }    
         
        // 监测页面滚动到文档的底部
        $(document).on('scrollstop', function() {
            var tblCont = $('.tbl-container');
            var loading = $('.ui-loading');
            var scrollTop = $(this).scrollTop();
            var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
            console.info(pageNum);
            console.info(loading.length);
            console.info(scrollTop);
            console.info("$(window).height()"+$(window).height());
            console.info(" $(this).height()"+ $(this).height());
            if(loading.length == 0) {
                var winHt = $(window).height();
                var docHt = $(this).height();
                var shiftHt = docHt - winHt;
                if(shiftHt < scrollTop || shiftHt == scrollTop) {
                    Page.pageCurr++;
                    searchBattLife()
                }
            }
        });
         function addUl(ulCon, dataList) {
            // 创建ul
            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
            // 遍历dataList生成li和a
            for (var i = 0; i < dataList.length; i++){
                var _li = $('<li></li');
                var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');
                // 将_a添加到_li,将_li添加到_ul中
                _li.append(_a);
                _ul.append(_li);
            }
            // 将_ul添加到容器中
            ulCon.append(_ul).trigger('create');
            loadclose();
        }
         function setarrbatt(arrdata,station){
         console.info(arrdata);
        if(arrdata.length>0){   //存入的为所有已查出数据                                              
gx_tieta/WebRoot/mobil/checkAccept-index.html
New file
@@ -0,0 +1,39 @@
<!doctype html>
    <html>
    <head>
        <meta charset="utf-8">
        <title>批准审批及验收</title>
        <meta name="viewport" content="width=device-width,initial-scale=1">
        <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
        <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
        <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
    </head>
    <body>
        <div data-role="page">
            <div data-role="header" data-position="fixed">
                <a href="index.html" 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>
            </div>
            <div data-role="content">
                <ul data-role="listview" data-inset="true">
                    <li>
                        <a href="batt-approve-index.html" target="_top">待审批</a>
                    </li>
                     <li>
                        <a href="batt-apprvedAccept-index.html" target="_top">待验收</a>
                    </li>
                     <li>
                        <a href="batt-unapproved-index.html" target="_top">已验收</a>
                    </li>
                </ul>
            </div>
            <!-- <div data-role="footer" data-position="fixed">
                <h1>福光电子有限公司</h1>
            </div> -->
        </div>
    </body>
    </html>
gx_tieta/WebRoot/mobil/index.html
@@ -46,6 +46,9 @@
            <li>
                <a href="map.html" target="_top" data-i18n="main.usermanagement">机房定位</a>
            </li>
            <li>
                <a href="checkAccept-index.html" target="_top" data-i18n="main.usermanagement">批准审批及验收</a>
            </li>
            <!-- <li>
                <a href="batt-home-info.html" target="_top" data-i18n="main.usermanagement">机房信息</a>
            </li> -->            
gx_tieta/WebRoot/power.jsp
@@ -241,7 +241,7 @@
            </div>
            <div class="list-con">
                <div class="list list1">
                    <span><s:text name="Batt_configuration_information"/><s:text name="Permit"/></span>            <!-- 作业变更管理权限 -->
                    <span><s:text name="Batt_configuration_information"/><s:text name="Permit"/></span>            <!-- 电池信息配置权限 -->
                    <table>
                        <tr>
                            <td><input type="checkbox" id="battcfg_query_permit"><s:text name="Search"/></td>                    <!-- 查询 -->
@@ -251,7 +251,16 @@
                        </tr>
                    </table>
                </div>
                <div class="list list2">
                    <span><s:text name='Approval_station_install'/><s:text name="Permit"/></span>        <!-- 基站安装审批权限  -->
                    <table>
                        <tr>
                            <td><input type="checkbox" id="install_look_permit"><s:text name="Search"/></td>            <!-- 查询 -->
                            <td><input type="checkbox" id="install_appr_permit"><s:text name="Audit"/></td>                <!-- 审核 -->
                            <td><input type="checkbox" id="install_check_permit"><s:text name="Acceptance"/></td>        <!-- 验收 -->
                        </tr>
                    </table>
                </div>
            </div>
            <!-- 设置当前容器遮罩层 -->
            <div class="mask"></div>
@@ -1314,6 +1323,27 @@
                        $('#battcfg_del_permit').prop('checked',true);
                    }
                }    
                //48基站安装审批    查询
                if(list[i].permit_item_name ==  'install_look_permit'){
                    if(list[i].permit_item_value == 1){
                        $('#install_look_permit').prop('checked',true);
                    }
                }
                //49基站安装审批    审核
                if(list[i].permit_item_name ==  'install_appr_permit'){
                    if(list[i].permit_item_value == 1){
                        $('#install_appr_permit').prop('checked',true);
                    }
                }
                //50站安装审批    验收
                if(list[i].permit_item_name ==  'install_check_permit'){
                    if(list[i].permit_item_value == 1){
                        $('#install_check_permit').prop('checked',true);
                    }
                }
            }
        }
    }
@@ -1811,6 +1841,33 @@
                            list[i].permit_item_value = 0;
                        }
                    }
                    //48基站安装审批    查询
                    if (list[i].permit_item_name == 'install_look_permit') {
                        if($('#install_look_permit').is(':checked')){
                            list[i].permit_item_value = 1;
                        }else{
                            list[i].permit_item_value = 0;
                        }
                    }
                    //49基站安装审批    审核
                    if (list[i].permit_item_name == 'install_appr_permit') {
                        if($('#install_appr_permit').is(':checked')){
                            list[i].permit_item_value = 1;
                        }else{
                            list[i].permit_item_value = 0;
                        }
                    }
                    //50基站安装审批    验收
                    if (list[i].permit_item_name == 'install_check_permit') {
                        if($('#install_check_permit').is(':checked')){
                            list[i].permit_item_value = 1;
                        }else{
                            list[i].permit_item_value = 0;
                        }
                    }
                }
            }
        }
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -86,7 +86,7 @@
             {"batt_discharge_model_permit","64"},    //用户密码重置
             {"batt_discharge_model_permit","65"},    //班组管理
             {"batt_discharge_model_permit","71"},    //电池组配组管理
             {"batt_discharge_model_permit","82"},    //基站安装审批
             {"install_look_permit","82"},    //基站安装审批
             {"batt_discharge_model_permit","83"},    //BTS设备升级
             
             {"batt_alm_param_query_permit","31"},        //告警参数设置
gx_tieta/src/global_zh_CN.properties
@@ -1111,7 +1111,8 @@
###################  ex-battinfo.jsp   ##################################
Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
Audit = \u5ba1\u6838
Acceptance = \u9a8c\u6536
##################  batch-set-curr.jsp  ##############################
Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5