From b98272182a7628142195dbd1c6ff90a3ad196c5b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 13:30:08 +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 | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 9a2d311..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,7 +564,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);
--
Gitblit v1.9.1