From dd50a070a1a080b2462a3d0de54b678d4679e296 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 17:05:05 +0800
Subject: [PATCH] 关闭输出
---
gx_tieta/WebRoot/control.jsp | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 312a61f..9099361 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -286,10 +286,10 @@
<td><s:text name="Computer_room_IP"/></td> <!-- 鏈烘埧IP -->
<td id="StationIP"></td>
</tr>
- <!-- <tr>
- <td><s:text name="Batt_group"/>ID</td> 鐢垫睜缁処D
+ <tr>
+ <td><s:text name="Batt_group"/>ID</td> <!-- 鐢垫睜缁処D -->
<td id="batt_group_id"></td>
- </tr> -->
+ </tr>
<tr>
<td><s:text name="Battery_name"/></td> <!-- 鐢垫睜缁勫悕绉� -->
<td id="BattGroupName"></td>
@@ -863,7 +863,7 @@
//var eMenuWidth = $('#echarts_menu').width();
//$('#echarts_menu').width(eMenuWidth);
- var isnotshowvalue=false; //鏄惁鏄剧ず鏌辩姸鍊�
+ var isnotshowvalue=true; //鏄惁鏄剧ず鏌辩姸鍊�
var mon_res_list; //鐢垫睜鍐呴樆鏁扮粍
var mon_vol_list; //鐢垫睜鐢靛帇鏁扮粍
var mon_ser_list; //鐢垫睜鐢靛鏁扮粍
@@ -1439,6 +1439,7 @@
data = eval("("+data+")");
var model = eval("("+data.result+")");
//console.log(model);
+
var outTime = 2*60; //璁惧瓒呮椂鏃堕棿(2鍒嗛挓)
var isOutTime = true; //閫氳涓柇 鍒ゆ柇璁惧鏄惁閫氳涓柇 true:涓柇 false:姝ｅ父
var batt = getBatt(); //鑾峰彇褰撳墠閫変腑鐨勭數姹犵粍
@@ -1450,6 +1451,8 @@
}else {
_str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);
}
+ //console.log(mygraph);
+ debugger;
if(model.code == 1) {
var nowTime = new Date().getTime(); //褰撳墠鏃堕棿
var record = new Date(model.data[0].record_datetime).getTime();
@@ -2742,29 +2745,7 @@
});
}
- //鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
- function createBattListen(ele, list) {
- ele.text("");
- var discharge_num = 0;
- var charge_num = 0;
- var ul = $('<ul></ul>');
- for(var i = 0; i < list.length; i++) {
- var li = "";
- if(list[i].isCharge) {
- li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
- charge_num++;
- }else {
- li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
- discharge_num++;
- }
-
- li.data('attr', list[i]);
- ul.append(li);
- }
- $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
- $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
- ele.append(ul);
- }
+
// 鐐瑰嚮鐢垫睜鍏呮斁鐢电洃娴嬪垪琛ㄨЕ鍙戜簨浠�
$(function() {
@@ -3339,7 +3320,8 @@
searchBtsBattInfoByStation(temp); // 鏌ヨ鏈烘埧淇℃伅
searchBTSTestParam({
num: CMD_BTS_GetDischargeParm,
- dev_id: batt.FBSDeviceId
+ dev_id: batt.FBSDeviceId,
+ TestCmd: 0
});
BTS_popup.showPopup();
@@ -3371,7 +3353,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({
@@ -3415,7 +3398,8 @@
$('#btn_flush').click(function (){
var temp = {
dev_id:$('#dev_id').val(),
- num:CMD_BTS_GetDischargeParm
+ num:CMD_BTS_GetDischargeParm,
+ TestCmd: 0
};
searchBTSTestParam(temp);
});
@@ -3440,7 +3424,8 @@
// 鏋勯�犲惎鍔ㄦ潯浠�
var temp = {
num: CMD_BTS_Start,
- dev_id: $('#dev_id').val()
+ dev_id: $('#dev_id').val(),
+ TestCmd: $('#discharge_type').val()
};
sendCmdToBTSDev(temp);
});
@@ -3973,9 +3958,19 @@
}
mygraph.ischange = 1; //閲嶆柊缁樺埗鎷撴墤鍥�
+
+ // 璐熻浇鐢垫祦
+ var loadCurr = batt.Load_curr+'A';
+ changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
+
+ // 鏈�澶ф牳瀹圭數娴�
+ var disCurrMax = batt.DisCurrMax+'A';
+ changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
+
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
clearInterval(time);
+ mygraph.graphtype = 4;
showtable();
time=window.setInterval("showtable()",4000);
}
@@ -3989,8 +3984,8 @@
BattGroupId=$(this).attr("id");
var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
- var scrollY=$("body").scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
-
+ var scrollY=$(window).scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
+ console.log(scrollY);
var oRightMenu=document.getElementById("right_menu");
$(this).click();
@@ -3999,9 +3994,10 @@
$("#right_menu").show();
$("#right_menu .more_menu").hide();
$("#right_menu .angle").hide();
+ console.log(disX+"***"+disY);
//浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
- oRightMenu.style.left=disX+'px';
- oRightMenu.style.top=disY+scrollY+'px';
+ oRightMenu.style.left= disX+'px';
+ oRightMenu.style.top= disY+scrollY+'px';
setPosition($("#right_menu"),disX, disY);
--
Gitblit v1.9.1