From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 2c36469..b15bc4f 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -301,13 +301,12 @@
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);
@@ -329,7 +328,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 +356,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);
--
Gitblit v1.9.1