From c73e68680f1884ed9e2260ea9c5dcde8e4d48615 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 24 十月 2018 15:50:01 +0800
Subject: [PATCH] 饼状图
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 2c36469..6cab98b 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -111,7 +111,7 @@
};
// 鑾峰彇folder鐨勪竴鏉℃暟鎹�
- _prop.getFolder = function (txt, cla, attr) {
+ _prop.getFolder = function (txt, cla,attr) {
var tmp = {};
tmp.txt = txt;
tmp.cla = cla;
@@ -172,7 +172,6 @@
var tgt = aFolders.eq(0);
aFolders.each(function() {
var _txt = $(this).find('.treeview-txt').text();
- console.info();
if(txt == _txt) {
tgt = $(this);
}
@@ -203,6 +202,14 @@
// 瀹氫箟椤甸潰涓殑siderbar缁勪欢
;(function($, window, document, gl, undefined) {
gl.namespace('pages.siderbar');
+
+ // 鑾峰彇褰撳墠閫変腑鍐呭锛堢渷-甯�-鏈烘埧-鐢垫睜缁勶級
+ var province = getQueryString('province'); // 鐪�
+ var city = getQueryString('city'); // 甯�
+ var home = getQueryString('home'); // 鏈烘埧
+
+ //console.log(province);
+
// 鐢熸垚涓�绾у鑸�-鐪�
function first(treeView, container) {
//treeView.addProgress(container);
@@ -223,7 +230,7 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
- treeView.spreadFolder('province', '', firstSpread);
+ treeView.spreadFolder('province', province, firstSpread);
}else {
}
@@ -267,7 +274,7 @@
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('city', '', secondSpread, true);
+ treeView.spreadFolder('city', city, secondSpread, true);
}
}else {
@@ -301,18 +308,17 @@
success: function(data){
var rs = JSON.parse(data.result);
treeView.delProgress(container);
- console.info(rs);
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.StationName3, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
if(spread) {
- treeView.spreadFolder('home', '', thirdSpread, true);
+ treeView.spreadFolder('home', home, thirdSpread, true);
}
}else {
@@ -329,7 +335,7 @@
var tmp = {
StationName1: data.StationName1,
StationName2: data.StationName2,
- StationName3: data.StationName3,
+ StationName: data.StationName,
StationId: data.StationId
};
fourth(treeView, container, tmp, true);
@@ -357,7 +363,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);
+ var tmp = treeView.getFile(__data.StationName, 'home', '',__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -389,6 +395,7 @@
treeView.delProgress(container);
if(rs.code == 1) {
var _data= rs.data;
+ //console.log(_data);
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
@@ -396,9 +403,12 @@
formatData.push(tmp);
}
treeView.treeView(container, formatData);
-
+ //console.info(formatData);
if(active) {
treeView.activeFile('eleGroup', '');
+ var battId = formatData[0].id;
+ location.hash="#"+battId;
+ location.hash = "";
}
}else {
--
Gitblit v1.9.1