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

81041

2019-01-02 b2f21d080425b0ab6e5e6170914ca2c615e5d185

 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} // 设备告警参数设置