From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 930a16f..333fa50 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);
}
@@ -220,7 +220,7 @@
var city = getQueryString('city'); // 甯�
var county = getQueryString('county'); // 鍖�/鍘�
var home = getQueryString('home'); // 鏈烘埧
-
+ var homeid = getQueryString('battid'); // 鐢垫睜缁刬d
//console.log(province);
// 鐢熸垚涓�绾у鑸�-鐪�
@@ -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);
@@ -467,7 +467,7 @@
treeView.treeView(container, formatData);
//console.info(formatData);
if(active) {
- treeView.activeFile(container,'eleGroup', '');
+ treeView.activeFile(container,'eleGroup', homeid);
var battId = formatData[0].id;
location.hash="#"+battId;
location.hash = "";
@@ -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