From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index 92bdd03..ae87870 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -118,8 +118,8 @@
});
//鑾峰彇BTS璁惧鐨勬祴璇曞弬鏁扮瓑
-function searchBTSTestParam(temp){
- var is_showAlert = (arguments.length==1);
+function searchBTSTestParam(temp, acStart){
+ var is_showAlert = (acStart == undefined);
loading.showLoading();
$.ajax({
type: "post",
@@ -134,9 +134,13 @@
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) {
+ BTSBtn.startTest(false);
+ }
+
}else{
if(model.data != undefined && model.data.length>0){
setBTSParam(model.data, true);
@@ -236,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,
@@ -313,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