修改审核显示逻辑 添加权限

hdw

2019-01-07 24c17a49ecd8ee459f6c96cdda7860126c78aa06

修改审核显示逻辑 添加权限

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

                                    resData.push(_tmp);

                                    if(_data.apply_note &&_data.apply_note != Page.all) {

                                        resData.push(_tmp);

                                        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'

      ];