From a154f6bf9dd0145fe23b848134ae43bfaba8c106 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 07 十一月 2018 13:09:26 +0800
Subject: [PATCH] 修改bug
---
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 1 +
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 9958cbf..12d4bb8 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -63,6 +63,7 @@
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
+ <script type="text/javascript" src="../pages/js/base.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
<script type="text/javascript" src="../pages/js/common.js"></script>
<script type="text/javascript">
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index f836ef5..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);
--
Gitblit v1.9.1