From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/index.html | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index 9116e45..212df11 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -23,7 +23,7 @@
<a href="machineroomM.html" target="_top" data-i18n="main.index">娴嬭瘯鏁版嵁</a>
</li>
<li>
- <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">鐢垫睜瀹夎鐢宠</a>
+ <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">bts瀹夎鐢宠</a>
</li>
<li>
<a href="auditDetail.html" target="_top" data-i18n="main.warningmanagement">瀹℃壒璇︽儏</a>
@@ -44,11 +44,11 @@
<li>
<a href="indexctM.html" target="_top" data-i18n="main.usermanagement">浣滀笟绠＄悊</a>
</li>
- <li>
- <a href="map.html" target="_top" data-i18n="main.usermanagement">鏈烘埧瀹氫綅</a>
- </li>
+ <!-- <li>
+ <a href="map.html" target="_top" id="LocationCR" data-i18n="main.usermanagement">鏈烘埧瀹氫綅</a>
+ </li> -->
<li>
- <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">鎵瑰噯瀹℃壒鍙婇獙鏀�</a>
+ <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">bts瀹夎瀹℃壒鍜岄獙鏀�</a>
</li>
<!-- <li>
<a href="batt-home-info.html" target="_top" data-i18n="main.usermanagement">鏈烘埧淇℃伅</a>
@@ -92,8 +92,16 @@
delCookie("station");
delCookie("eleparm");
delCookie("eleparm1");
+ delCookie("happroval");
$(document.body).css( "visibility", "visible") ;
});
+
+ //鎷︽埅瀹夊崜鍥為��鎸夐挳
+ history.pushState(null, null, location.href);
+ window.addEventListener('popstate', function(event) {
+ history.pushState(null, null, location.href );
+ //姝ゅ鍔犲叆鍥為��鏃朵綘瑕佹墽琛岀殑浠ｇ爜
+ });
//瀹夊叏閫�鍑�
function exitUser(){
@@ -106,7 +114,7 @@
$.ajax({
type: 'post',
async: false,
- url: 'User_permitgroup_dataAction!getPermits',
+ url: 'User_permitgroup_dataAction!FromSessiongetPermits',
data: null,
dataType: 'json',
success:function(data) {
@@ -116,10 +124,12 @@
if(isHasPermit("install_look_permit",data)){
}else{
document.getElementById("check_Accept").style.display="none";
+ document.getElementById("LocationCR").style.display="none";
}
}
});
}
+
//鏍规嵁鏉冮檺鍚嶅垽鏂槸鍚﹀叿鏈夋煇涓潈闄�
function isHasPermit(_permitName,_permitList)
{
--
Gitblit v1.9.1