From 24c17a49ecd8ee459f6c96cdda7860126c78aa06 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期一, 07 一月 2019 17:02:55 +0800
Subject: [PATCH] 修改审核显示逻辑 添加权限
---
gx_tieta/WebRoot/ex-battinfo.jsp | 48 ++++++++++++++++++++++++++++++++++++++++++------
gx_tieta/WebRoot/bat-set-test.jsp | 6 +++---
gx_tieta/WebRoot/js/buildNav.js | 4 ++--
3 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index c633f5f..9768896 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/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
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index a17b80b..4eac20f 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/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>
diff --git a/gx_tieta/WebRoot/js/buildNav.js b/gx_tieta/WebRoot/js/buildNav.js
index fa2f490..aa37cb8 100644
--- a/gx_tieta/WebRoot/js/buildNav.js
+++ b/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'
];
--
Gitblit v1.9.1