From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/js/buildNav.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/js/buildNav.js b/gx_tieta/WebRoot/js/buildNav.js
index dcc5cbf..fa2f490 100644
--- a/gx_tieta/WebRoot/js/buildNav.js
+++ b/gx_tieta/WebRoot/js/buildNav.js
@@ -53,10 +53,10 @@
      	
      	//鐢垫睜鏀剧數娴嬭瘯
      	{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: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},		//鐝粍绠$悊
@@ -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'
+      	'batt_alm_param_edit_permit', 'batt_alm_param_query_permit','batt_test_op_permit', 'battcfg_query_permit'
       ];
 
 

--
Gitblit v1.9.1