From e458320cba7664a484d3a763e288047edb74d55f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 26 十月 2018 15:52:02 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6d51ccf..9a2d311 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -568,6 +568,8 @@
}
treeView.treeView(container, formatData);
if(spread) {
+ location.hash="#"+homeInfo.StationName;
+ location.hash="";
treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
}
}
@@ -625,4 +627,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