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/ele-match-group.jsp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 86ac658..2b7fd9a 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -476,7 +476,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);
@@ -509,7 +509,7 @@
 			        		for(var i=0; i<_data.length;i++) {
 			        			var __data = _data[i];
 			        			var txt = '<input type="radio" name="city">'+ __data.StationName2;
-			        			var tmp = treeView.getFolder(txt, 'city', __data);
+			        			var tmp = treeView.getFolder(txt, 'city', __data.StationName2,__data);
 			        			formatData.push(tmp);
 			        		}
 			        		treeView.treeView(container, formatData);

--
Gitblit v1.9.1