From 5c2a279a7fc9887eb8e56781c36c341f3d8d2ca4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 15:23:40 +0800
Subject: [PATCH] 修改地图每4秒更新50
---
gx_tieta/WebRoot/control.jsp | 3 ++-
gx_tieta/WebRoot/index.jsp | 4 ++--
gx_tieta/WebRoot/js/dischargetest/bts.js | 8 ++++++--
gx_tieta/WebRoot/dischargetest.jsp | 10 ++++++----
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index ee80a7c..6e87fb6 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3350,7 +3350,8 @@
if(regEquipType(batt.FBSDeviceId, globalPattern.BTS)) {
var temp = {
num: CMD_BTS_Stop,
- dev_id: batt.FBSDeviceId
+ dev_id: batt.FBSDeviceId,
+ TestCmd: 0
};
// 鏄剧ず鏄惁鍋滄娴嬭瘯
myConfirm.show({
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 5ec0d36..fb40743 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -1418,9 +1418,9 @@
if(regEquipType(dev_id, globalPattern.LD9) || regEquipType(dev_id, globalPattern.BTS)) {
if(confirm("纭鍋滄"+dev_id+"璁惧鐨勬祴璇曞悧锛�")){
if(regEquipType(dev_id, globalPattern.LD9)){
- sendLD9DischargeParam(CMD_Stop);
+ sendLD9DischargeParam(CMD_Stop,true);
}else if(regEquipType(dev_id, globalPattern.BTS)){
- checkDischargeParam(CMD_Stop);
+ checkDischargeParam(CMD_Stop,true);
}
}
}
@@ -1587,14 +1587,16 @@
}
//鍚戝鎴风鍙戦�佹寚瀹氱殑鍛戒护
- function checkDischargeParam(cmd){
+ function checkDischargeParam(cmd,stop){
var dev_id = $('#main .tbl-body tbody tr.active').find('td').eq(2).text();
loading.showLoading($('#main'));
+ var distype = stop?0:$('#discharge_type').val();
var param = {
num:cmd,
dev_id:dev_id,
- TestCmd:$('#discharge_type').val()
+ TestCmd:distype
};
+
$.ajax({
type: "post",
url:"Fbs9100_setparamAction_action_serchbyDev_id",
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index eb12531..67e0988 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2114,7 +2114,7 @@
var allStation = [];
var mapPages = {
- pageSize:1000, // 姣忛〉鐨勮鏁�
+ pageSize:50, // 姣忛〉鐨勮鏁�
pageCurr:1, // 褰撳墠椤电爜鏁�
pageAll:1, // 鏁扮洰
pageNum: 0,
@@ -2203,7 +2203,7 @@
data: "json="+JSON.stringify(mapPages),
success: function(result) {
var data = JSON.parse(result.result);
- console.log(data);
+ //console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _list = formatUpdateStation(_data);
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index 92bdd03..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);
--
Gitblit v1.9.1