From 6db4de77bb9f1554854e50778fda8d9b479d6781 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 07 十二月 2018 13:53:08 +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 | 166 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 133 insertions(+), 33 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6c6d979..333fa50 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;
};
@@ -171,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);
}
@@ -187,7 +188,7 @@
_prop.activeFile = function(container, cla, id, callback) {
var rsCla = '.sider-menu-file'+'.'+cla;
var aFiles = container.find(rsCla);
- console.log(aFiles.length);
+ //console.log(aFiles.length);
// 娌℃湁鑾峰彇鍒板唴瀹瑰氨杩斿洖false
if(aFiles.length == 0) {
return false;
@@ -217,8 +218,9 @@
// 鑾峰彇褰撳墠閫変腑鍐呭锛堢渷-甯�-鏈烘埧-鐢垫睜缁勶級
var province = getQueryString('province'); // 鐪�
var city = getQueryString('city'); // 甯�
+ var county = getQueryString('county'); // 鍖�/鍘�
var home = getQueryString('home'); // 鏈烘埧
-
+ var homeid = getQueryString('battid'); // 鐢垫睜缁刬d
//console.log(province);
// 鐢熸垚涓�绾у鑸�-鐪�
@@ -237,7 +239,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 +281,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);
@@ -303,7 +305,7 @@
}
- // 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+ // 鐢熸垚 涓夌骇瀵艰埅-鍖�/鍘�
function third(treeView, container, data, spread) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
@@ -312,7 +314,7 @@
treeView.addProgress(container);
$.ajax({
type: "post",
- url: "BattInfAction!serchStationName3",
+ url: "BattInfAction!serchStationName5",
async:true,
dataType:'json',
data:"json = "+JSON.stringify(data),
@@ -324,12 +326,12 @@
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.StationName5, 'county', __data.StationName5,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('home', home, thirdSpread, true);
+ treeView.spreadFolder('county', county, thirdSpread, true);
}
}else {
@@ -346,15 +348,49 @@
var tmp = {
StationName1: data.StationName1,
StationName2: data.StationName2,
- StationName: data.StationName,
- StationId: data.StationId
+ StationName5: data.StationName5,
};
fourth(treeView, container, tmp, true);
}
- // 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+ // 鐢熸垚 涓夌骇瀵艰埅-鍖�/鍘�
function thirdFile(treeView, container, data) {
+ // 宸茬粡瀛樺湪
+ if(container.find('ul').length !=0) {
+ return;
+ }
+ treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ treeView.delProgress(container);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFile(__data.StationName5, 'county', '',__data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+ }else {
+
+ }
+ }
+ });
+ }
+
+ // 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
+ gl.pages.siderbar.thirdFile = thirdFile;
+
+ //鐢熸垚鍥涚骇瀵艰埅-鏈烘埧
+ function fourth(treeView, container, data, spread) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
return;
@@ -374,10 +410,13 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.StationName, 'home', '',__data);
+ var tmp = treeView.getFolder(__data.StationName3, 'home', __data.StationName,__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
+ if(spread) {
+ treeView.spreadFolder('home', home, fourthSpread, true);
+ }
}else {
}
@@ -386,10 +425,22 @@
}
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
- gl.pages.siderbar.thirdFile = thirdFile;
+ gl.pages.siderbar.fourth = fourth;
- // 鐢熸垚 涓夌骇瀵艰埅-鐢垫睜缁�
- function fourth(treeView, container, data, active) {
+ // 灞曞紑鍥涚骇瀵艰埅
+ function fourthSpread(treeView, container, data) {
+ var tmp = {
+ StationName1: data.StationName1,
+ StationName2: data.StationName2,
+ StationName5: data.StationName5,
+ StationName: data.StationName,
+ StationId: data.StationId
+ };
+ fifth(treeView, container, tmp, true);
+ }
+
+ // 鐢熸垚浜旂骇瀵艰埅-鐢垫睜缁�
+ function fifth(treeView, container, data, active) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
return;
@@ -416,7 +467,7 @@
treeView.treeView(container, formatData);
//console.info(formatData);
if(active) {
- treeView.activeFile(container,'eleGroup', '');
+ treeView.activeFile(container,'eleGroup', homeid);
var battId = formatData[0].id;
location.hash="#"+battId;
location.hash = "";
@@ -427,10 +478,8 @@
}
});
}
-
// 灏嗗嚱鏁扮粦瀹氬埌GLOBAL.pages.siderbar鐨勫懡鍚嶇┖闂翠笅
- gl.pages.siderbar.fourth = fourth;
-
+ gl.pages.siderbar.fifth = fifth;
})(jQuery, window, document, GLOBAL);
@@ -456,6 +505,7 @@
first(treeView, container);
homeInfo.StationName1 = data.province;
homeInfo.StationName2 = data.city;
+ homeInfo.StationName5 = data.county;
homeInfo.StationName = data.home;
homeInfo.StationId = data.homeid;
battId = data.battid;
@@ -480,7 +530,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 +570,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);
@@ -539,13 +589,56 @@
}
- // 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+ // 鐢熸垚 涓夌骇瀵艰埅-鍖�/鍘�
function third(treeView, container, data, spread) {
+ // 宸茬粡瀛樺湪
+ if(container.find('ul').length !=0) {
+ location.hash="#"+homeInfo.StationName5;
+ location.hash="";
+ treeView.spreadFolder('county', homeInfo.StationName5, thirdSpread, true);
+ return;
+ }
+ treeView.addProgress(container);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ treeView.delProgress(container);
+ if(rs.code == 1) {
+ var _data= rs.data;
+ var formatData = [];
+ for(var i=0; i<_data.length;i++) {
+ var __data = _data[i];
+ var tmp = treeView.getFolder(__data.StationName5, 'county', __data.StationName5, __data);
+ formatData.push(tmp);
+ }
+ treeView.treeView(container, formatData);
+ if(spread) {
+ location.hash="#"+homeInfo.StationName5;
+ location.hash="";
+ treeView.spreadFolder('county', homeInfo.StationName5, thirdSpread, true);
+ }
+ }
+ }
+ });
+ }
+
+ // 灞曞紑涓夌骇瀵艰埅
+ function thirdSpread(treeView, container, data) {
+ fourth(treeView, container, homeInfo, true);
+ }
+
+ // 鐢熸垚 鍥涚骇瀵艰埅-鏈烘埧
+ function fourth(treeView, container, data, spread) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
location.hash="#"+homeInfo.StationName;
location.hash="";
- treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
+ treeView.spreadFolder('home', homeInfo.StationName, fourthSpread, true);
return;
}
treeView.addProgress(container);
@@ -563,25 +656,30 @@
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.StationName3, 'home', __data.StationName, __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('home', homeInfo.StationName, thirdSpread, true);
+ location.hash="#"+homeInfo.StationName;
+ location.hash="";
+ treeView.spreadFolder('home', homeInfo.StationName, fourthSpread, true);
}
}
}
});
}
+
// 灞曞紑涓夌骇瀵艰埅
- function thirdSpread(treeView, container, data) {
- fourth(treeView, container, homeInfo, true);
+ function fourthSpread(treeView, container, data) {
+ fifth(treeView, container, homeInfo, true);
}
- // 鐢熸垚 涓夌骇瀵艰埅-鐢垫睜缁�
- function fourth(treeView, container, data, active) {
+
+
+ // 鐢熸垚 浜旂骇瀵艰埅-鐢垫睜缁�
+ function fifth(treeView, container, data, active) {
// 宸茬粡瀛樺湪
if(container.find('ul').length !=0) {
container.addClass('sider-menu-open');
@@ -645,7 +743,9 @@
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);
--
Gitblit v1.9.1