From cfa12a50f8e6de09a2e57fa8359dbec5e2b07628 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期二, 23 十月 2018 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 385d8b4..a680935 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -111,7 +111,7 @@
};
// 鑾峰彇folder鐨勪竴鏉℃暟鎹�
- _prop.getFolder = function (txt, cla, attr) {
+ _prop.getFolder = function (txt, cla,attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
@@ -230,7 +230,7 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
- treeView.spreadFolder('province', '', firstSpread);
+ treeView.spreadFolder('province', province, firstSpread);
}else {
}
@@ -274,7 +274,7 @@
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('city', '', secondSpread, true);
+ treeView.spreadFolder('city', city, secondSpread, true);
}
}else {
@@ -318,7 +318,7 @@
}
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('home', '', thirdSpread, true);
+ treeView.spreadFolder('home', home, thirdSpread, true);
}
}else {
@@ -395,6 +395,7 @@
treeView.delProgress(container);
if(rs.code == 1) {
var _data= rs.data;
+ //console.log(_data);
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
@@ -402,9 +403,12 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
-
+ //console.info(formatData);
if(active) {
treeView.activeFile('eleGroup', '');
+ var battId = formatData[0].id;
+ location.hash="#"+battId;
+ location.hash = "";
}
}else {
--
Gitblit v1.9.1