From d00b94b5771112a25971e934a36c86a15e1c475b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期一, 14 一月 2019 18:03:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-param2.html | 5 +++--
gx_tieta/WebRoot/mobil/index.html | 4 +++-
gx_tieta/WebRoot/mobil/control.html | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 5b98709..a8de8a7 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -29,7 +29,7 @@
<a href="voltageM.html" target="_top">1.鍗曚綋鐢靛帇 </a>
</li>
- <li>
+ <!--<li>
<a href="temperatureM.html" target="_top">2.娓╁害 </a>
</li>
<li>
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index d118375..f7778ab 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -300,8 +300,8 @@
StationName1:'',
StationName2: '',
StationName5:''
- };
-
+ };
+ loadshow();
// 鏌ヨ鏈烘埧淇℃伅
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
var rs = JSON.parse(result.result);
@@ -325,6 +325,7 @@
//console.log(homeSource)
// 璁剧疆璧勬簮鍐呭
$('#searchHomeIframe').data('homeSource', homeSource);
+ loadclose();
}
});
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index efcd5b7..f221904 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -45,7 +45,7 @@
<a href="indexctM.html" target="_top" data-i18n="main.usermanagement">浣滀笟绠＄悊</a>
</li>
<li>
- <a href="map.html" target="_top" data-i18n="main.usermanagement">鏈烘埧瀹氫綅</a>
+ <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>
@@ -92,6 +92,7 @@
delCookie("station");
delCookie("eleparm");
delCookie("eleparm1");
+ delCookie("happroval");
$(document.body).css( "visibility", "visible") ;
});
@@ -116,6 +117,7 @@
if(isHasPermit("install_look_permit",data)){
}else{
document.getElementById("check_Accept").style.display="none";
+ document.getElementById("LocationCR").style.display="none";
}
}
});
--
Gitblit v1.9.1