From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/dischargetest/bts.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index d7439b0..8cfd0d7 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",
@@ -137,6 +137,10 @@
noContent.showNoContent("鑾峰彇娴嬭瘯鍙傛暟鎴愬姛");
}
initPopup(BTS_popup);
+ if(!acStart) {
+ BTSBtn.startTest(false);
+ }
+
}else{
if(model.data != undefined && model.data.length>0){
setBTSParam(model.data, true);
@@ -239,7 +243,8 @@
noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛");
var temp = {
num:CMD_61850_GETPARAM,
- dev_id:param.dev_id
+ dev_id:param.dev_id,
+ TestCmd: 0
};
searchBTSTestParam(temp,true); //閲嶆柊璇诲彇涓�娆℃祴璇曞弬鏁�
--
Gitblit v1.9.1