From be1267c82755ea2217e3e84d6b47661eaf075497 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 25 九月 2018 16:04:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 74b0ab4..e792f0f 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -15,6 +15,7 @@
<link href="css/basic.css" type="text/css" rel="stylesheet" />
<link href="css/control_style.css" type="text/css" rel="stylesheet" />
<link rel="stylesheet" href="css/BrdwMaint.css">
+ <link rel="stylesheet" href="css/common.css">
<link href="jqueryui/jquery-ui.css" type="text/css" rel="stylesheet" />
<!-- <link rel="stylesheet" type="text/css" href="css/popup.css"> -->
<link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
@@ -840,6 +841,7 @@
<script type="text/javascript" src="js/dischargetest/bts.js"></script>
<script type="text/javascript" src="js/dischargetest/4016.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
+ <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -1111,7 +1113,7 @@
}
- seachAllStation();
+ //seachAllStation();
//鏌ヨ鎵�鏈夋満鎴�
function seachAllStation(){
$.ajax({
@@ -2672,17 +2674,6 @@
$(this).attr('href', 'charge-test.jsp?battgroupId='+BattGroupId+"&stationId="+batt.StationId);
});
});
-
-
- $(function() {
- $('#ele_content').resizable({
- minWidth: 240,
- maxWidth: 520,
- handles: 'e',
- edge: 10
- });
- });
-
$(function(){
//鍚姩鏌ヨ鐢垫睜鍏呮斁鐢电姸鎬佺殑绾跨▼
@@ -3944,6 +3935,51 @@
$('.confirm').hide();
$('.confirm-mask').hide();
}
+
+ // siderbar妯″潡
+ $(function() {
+ var TreeView = GLOBAL.pages.TreeView;
+ var first = GLOBAL.pages.siderbar.first; // 涓�绾у鑸�
+ var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
+ var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
+ var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var treeView = new TreeView($('#lside'));
+ // 璁剧疆瀹瑰櫒鍙嫋鍔�
+ $('#ele_content').resizable({
+ handles: 'e',
+ maxWidth: 520,
+ minWidth: 200,
+ alsoResize: $('#lside'),
+ resize:function() {
+ treeView.setContainer();
+ }
+ });
+
+ // 鐢熸垚涓�绾у鑸�-鐪�
+ first(treeView, treeView.container);
+
+ // 鐪�->甯�
+ treeView.ele.on('click', '.province', function() {
+ var province = $(this).data('attr');
+ second(treeView, $(this).parent(), province);
+ });
+
+ // 甯�->鏈烘埧
+ treeView.ele.on('click', '.city', function() {
+ var city = $(this).data('attr');
+ third(treeView, $(this).parent(), city);
+ });
+
+ // 鏈烘埧->鐢垫睜缁�
+ treeView.ele.on('click', '.home', function() {
+ var home = $(this).data('attr');
+ var tmp = {
+ StationId: home.StationId
+ };
+ console.info(tmp);
+ fourth(treeView, $(this).parent(), tmp);
+ });
+ });
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1