From 2b41a088ffcd22a34b24ccb8d96be040de840b79 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期三, 07 十一月 2018 16:03:28 +0800
Subject: [PATCH] 从其他页面跳转到实时告警和历史告警页面选中指定的机房或者电池组
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 930a16f..4a630cf 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -172,7 +172,7 @@
}
var tgt = aFolders.eq(0);
aFolders.each(function() {
- var _txt = $(this).find('.treeview-txt').text();
+ var _txt = $(this).find('.treeview-txt').parent().attr('id');
if(txt == _txt) {
tgt = $(this);
}
@@ -410,7 +410,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName,__data);
+ var tmp = treeView.getFolder(__data.StationName3, 'home', __data.StationName,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -638,7 +638,7 @@
if(container.find('ul').length !=0) {
location.hash="#"+homeInfo.StationName;
location.hash="";
- treeView.spreadFolder('home', homeInfo.StationName, fourthSpread, true);
+ treeView.spreadFolder('home', homeInfo.StationName3, fourthSpread, true);
return;
}
treeView.addProgress(container);
@@ -656,7 +656,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName, __data);
+ var tmp = treeView.getFolder(__data.StationName3, 'home', __data.StationName, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -743,7 +743,9 @@
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);
--
Gitblit v1.9.1