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

81041

2019-01-08 de072c451bdf8b49efea074e86d129e043e9df6b

 gx_tieta/WebRoot/js/buildNav.js

@@ -53,13 +53,16 @@
        

        //电池放电测试

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

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

        

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

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

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

        {permit_item_name:'batt_discharge_model_permit',num:68},      //线程监控管理

        {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:'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}, // 电池告警参数设置

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

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

         'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit', 'install_look_permit'

      ];