From 2421e7a75751f1f8e0fc58811a7abcfd8420c13d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 29 十月 2018 10:48:49 +0800
Subject: [PATCH] 修复bug
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6d51ccf..3b56f4d 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -65,7 +65,7 @@
// 璁剧疆瀹瑰櫒鐨勫搴�
_prop.setContainer = function() {
var eleWidth = this.ele.width();
- this.container.width(eleWidth+20);
+ //this.container.width(eleWidth+20);
};
// 鐢熸垚鍒楄〃
@@ -88,7 +88,7 @@
var _data = $.extend({}, defaults, data[i]);
// 璁剧疆鍐呭瀹瑰櫒
var _li = $('<li></li>');
- var _a = $('<a href="javascript:;" id="'+_data.txt+'" class="sider-menu-folder"></a>');
+ var _a = $('<a href="javascript:;" id="'+_data.id+'" class="sider-menu-folder"></a>');
var _i = $('<i class="fa fa fa-caret-right"></i>');
var _span = $('<span class="treeview-txt">'+_data.txt+'</span>');
if(_data.file) {
@@ -111,10 +111,11 @@
};
// 鑾峰彇folder鐨勪竴鏉℃暟鎹�
- _prop.getFolder = function (txt, cla,attr) {
+ _prop.getFolder = function (txt, cla, id,attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
+ tmp.id = id;
tmp.attr = attr;
return tmp;
};
@@ -237,7 +238,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -279,7 +280,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName2, 'city', __data);
+ var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -324,7 +325,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -480,7 +481,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName1, 'province', __data);
+ var tmp = treeView.getFolder(__data.StationName1, 'province', __data.StationName1,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -520,7 +521,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName2, 'city', __data);
+ var tmp = treeView.getFolder(__data.StationName2, 'city', __data.StationName2, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -563,11 +564,13 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data.StationName, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
if(spread) {
+ location.hash="#"+homeInfo.StationName;
+ location.hash="";
treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
}
}
@@ -625,4 +628,28 @@
}
});
}
-})(jQuery, window, document, GLOBAL);
\ No newline at end of file
+})(jQuery, window, document, GLOBAL);
+
+//鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
+function createBattListen(ele, list) {
+ ele.text("");
+ var discharge_num = 0;
+ var charge_num = 0;
+ var ul = $('<ul></ul>');
+ for(var i = 0; i < list.length; i++) {
+ var li = "";
+ if(list[i].isCharge) {
+ li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
+ charge_num++;
+ }else {
+ li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
+ discharge_num++;
+ }
+
+ 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);
+}
\ No newline at end of file
--
Gitblit v1.9.1