From 3d175b70811d8da4258aa0ec6cc6d79ff912b36f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 17:02:03 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/WebRoot/control.jsp | 9 +++++++--
gx_tieta/WebRoot/js/elecircle.content.js | 1 -
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6e87fb6..94e2813 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1425,7 +1425,7 @@
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
function searchDevStatusByDev_id(){
var obj = getBatt();
- //console.info(obj);
+ console.info(obj);
var lasttype = mygraph.graphtype; //璁板綍涓婁竴娆＄殑鐘舵��
$.ajax({
type: "post",
@@ -1438,7 +1438,8 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- //console.log(model);
+ 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();
@@ -3955,6 +3958,7 @@
}
mygraph.ischange = 1; //閲嶆柊缁樺埗鎷撴墤鍥�
+
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
@@ -3966,6 +3970,7 @@
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
clearInterval(time);
+ mygraph.graphtype = 4;
showtable();
time=window.setInterval("showtable()",4000);
}
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 47e27b4..4ce250c 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -945,7 +945,6 @@
if(typeof callback == 'function') {
callback.call({}, data);
}
-
// 鍒ゆ柇workstatus
switch(workstatus) {
case 0: { // 娴厖鐘舵��
--
Gitblit v1.9.1