From da39f98e80e7725076cee697333666d091a38b20 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 07 十一月 2018 10:35:17 +0800
Subject: [PATCH] 自动关闭成功面板
---
gx_tieta/WebRoot/control.jsp | 6 ++++--
gx_tieta/WebRoot/js/dischargetest/bts.js | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 8952efb..1f22231 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1130,6 +1130,8 @@
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<div id="allShade"></div>
<div class="clear"></div>
+ <!-- 寮曞叆layui妗嗘灦 -->
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="js/jquery.bigcolorpicker.min.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
@@ -1152,8 +1154,6 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
- <!-- 寮曞叆layui妗嗘灦 -->
- <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -4735,8 +4735,10 @@
$('#signalBtn').click(function() {
var batt = getBatt();
signalSearch.dev_id = batt.FBSDeviceId;
+ var load = layer.load(1);
// 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
searchStationSignal(signalSearch,function(data){
+ layer.close(load);
// 鍩虹閰嶇疆
var signalOpts = {
img: signalBad,
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index 8cfd0d7..ae87870 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -134,7 +134,7 @@
if(model.code == 1 && model.data != undefined && model.data.length>0){
setBTSParam(model.data, false);
if(is_showAlert){
- noContent.showNoContent("鑾峰彇娴嬭瘯鍙傛暟鎴愬姛");
+ noContent.showNoContent("鑾峰彇娴嬭瘯鍙傛暟鎴愬姛", true);
}
initPopup(BTS_popup);
if(!acStart) {
@@ -240,7 +240,7 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code == 1){
- noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛");
+ noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛", true);
var temp = {
num:CMD_61850_GETPARAM,
dev_id:param.dev_id,
@@ -317,13 +317,13 @@
function showBTSContent(cmd, issuccess) {
if(cmd == CMD_BTS_Start){
if(issuccess){
- noContent.showNoContent("鍚姩娴嬭瘯鎴愬姛");
+ noContent.showNoContent("鍚姩娴嬭瘯鎴愬姛", true);
}else{
noContent.showNoContent("鍚姩娴嬭瘯澶辫触");
}
}else if(cmd == CMD_BTS_Stop){
if(issuccess){
- noContent.showNoContent("鍋滄娴嬭瘯鎴愬姛");
+ noContent.showNoContent("鍋滄娴嬭瘯鎴愬姛", true);
}else{
noContent.showNoContent("鍋滄娴嬭瘯澶辫触");
}
--
Gitblit v1.9.1