From d55a20bca83c456949f14cd340e40fe2c6a3bf85 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期三, 02 一月 2019 15:53:43 +0800
Subject: [PATCH] 拓扑图延时问题修复
---
gx_tieta/WebRoot/control.jsp | 4 +++-
gx_tieta/WebRoot/js/elecircle.content.js | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6e69e0d..8ccb32c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1933,11 +1933,13 @@
//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
function showtable(){
//searbattrealInfomation();
- searchDevStatusByDev_id();
findrtstate();
findrtdata();
//鏌ヨ璁惧鐨刣cdc鐘舵��
searchDevDcDcState();
+
+ // 鏇存柊鎷撴墤鍥剧姸鎬�
+ searchDevStatusByDev_id();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index d25ed1a..f887e9c 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -1082,7 +1082,9 @@
var data = model.data[0];
var alarmstatus = data.dev_alarmstate; //[0:'鏃�',1:'鏆傚仠',2:'鏀剧數娴嬭瘯',3:'鏀剧數绛夊緟',4:'闄愭祦鍏呯數',5:'鐩存祦鍏呯數',6:'鍏呯數绛夊緟',7:'娴嬭瘯鏃堕棿鍒�',8:'娴嬭瘯瀹归噺鍒�',9:'鍗曚綋涓嬮檺鍒�',10:'缁勭涓嬮檺鍒�',11:'甯傜數寮傚父',12:'瀛樺偍鍗′笉瓒�',13:'璐熻浇娓╁害楂�',14:'鐢垫祦寮傚父',15:'杩滅▼閫氫俊鍧�',16:'璐熻浇閫氫俊鍧�',17:'閫夋嫨閫氫俊鍧�',18:'璐熻浇鐢垫祦鍧�',19:'鍐呭瓨鐢宠鍧�',20:'鏈煡'];
var workstatus =parseInt(data.dev_workstate) ; //[0:'鍦ㄧ嚎鐩戞祴',1:'鏀剧數娴嬭瘯',2:'鍏呯數娴嬭瘯',3:'鍐呴樆娴嬭瘯',4:'鏈煡'];
- // 鍒ゆ柇workstatus
+ // console.log(workstatus);
+ // console.log(data.dev_testgroupnum+'***'+(batt.GroupIndexInFBSDevice+1)+'***'+mygraph.battstate);
+ // 鍒ゆ柇workstatus
switch(workstatus) {
case 0: { // 娴厖鐘舵��
mygraph.graphtype = 0;
@@ -1150,6 +1152,7 @@
callback.apply({}, [batt, data, mygraph]);
}
}else {
+ // console.log(123);
mygraph.graphtype = 4 ;
_str = '(鏈繛鎺�)';
// 鍥炶皟鍑芥暟
@@ -1157,6 +1160,7 @@
callback();
}
}
+ // console.log(lasttype+"**"+mygraph.graphtype);
// 鍒ゆ柇鏄惁鏇存柊鎷撴墤鍥�
if(lasttype != mygraph.graphtype){
mygraph.ischange = 1;
--
Gitblit v1.9.1