From 6db4de77bb9f1554854e50778fda8d9b479d6781 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 07 十二月 2018 13:53:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index f836ef5..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);
--
Gitblit v1.9.1