From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/ele-match-group.jsp |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 2b7fd9a..4c6d8d9 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -56,7 +56,7 @@
 					<div class="side-bar" id="sideBar"></div>
 				</div>
 			</div>
-			<div class="abs abs-right left360" id="inforCont">
+			<div class="abs abs-left360" id="inforCont">
 				<div class="tbl-container">
 					<table class="" id="groupTbl" lay-filter="groupTbl"></table>
 				</div>
@@ -91,7 +91,7 @@
 			var treeView = new TreeView($('#sideBar'));
 			
 			// 璁剧疆宸﹀彸缂╂斁
-			$('#resizeCont .side-bar-container').resizable({
+			/* $('#resizeCont .side-bar-container').resizable({
 				handles: 'e',
 				maxWidth: 520,
 				minWidth: 240,
@@ -100,7 +100,7 @@
 					treeView.setContainer();
 					$('#inforCont').css('left', ui.size.width+'px');
 				}
-			});
+			}); */
 			
 			// 鐢熸垚涓�绾у鑸�-鐪�
 			first(treeView, treeView.container);
@@ -111,12 +111,12 @@
 				second(treeView, $(this).parent(), province);
 			});
 			
-			// 甯�->鏈烘埧
+			// 甯�->鍖�/鍘�
 			treeView.ele.on('click', '.city', function() {
 				var city = $(this).data('attr');
-				third(treeView, $(this).parent(), city);
 				var radio = $(this).children('.treeview-txt').find('input');
 				radio.prop('checked', true);
+				third(treeView, $(this).parent(), city);
 				
 				// 鏈閫変腑
 				if(!$(this).hasClass('acCity')) {
@@ -217,7 +217,7 @@
 			function searchData() {
 				var temp = getSearchParams();	// 鑾峰彇鏌ヨ鏉′欢
 				// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏈烘埧淇℃伅
-				var loading = layer.load(0, {shade: [0.1,'#fff']}); //0浠h〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+				var loading = layer.load(1, {shade: [0.1,'#fff']}); //0浠h〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
 				$.ajax({
 					type: 'post',
 					url: 'BattInfAction!serchMakeGroup',
@@ -297,6 +297,7 @@
 				// 绗﹀悎鏉′欢鍚敤鏋勯�犲璞�
 				var temp = {
 					StationName2: attr.StationName2,
+					StationName5: '',
 					BattProducer: 1
 				};
 				
@@ -520,7 +521,7 @@
 				});
 			}
 			
-			// 鐢熸垚 涓夌骇瀵艰埅-鏈烘埧
+			// 鐢熸垚 涓夌骇瀵艰埅-鍖�/鍘�
 			function third(treeView, container, data) {
 				// 宸茬粡瀛樺湪
 				if(container.find('ul').length !=0) {
@@ -529,7 +530,7 @@
 				treeView.addProgress(container);
 				$.ajax({ 	
 			        type: "post", 				
-			        url: "BattInfAction!serchStationName3",				
+			        url: "BattInfAction!serchStationName5",				
 			        async:true,				
 			        dataType:'json',
 			        data:"json = "+JSON.stringify(data),	
@@ -541,8 +542,8 @@
 			        		var formatData = [];
 			        		for(var i=0; i<_data.length;i++) {
 			        			var __data = _data[i];
-			        			var txt = '<input type="checkbox" checked="checked" disabled name="home">'+ __data.StationName;
-			        			var tmp = treeView.getFile(txt, 'home', __data.StationId,__data);
+			        			var txt = '<input type="checkbox" checked="checked" disabled name="county">'+ __data.StationName5;
+			        			var tmp = treeView.getFile(txt, 'county', __data.StationName5,__data);
 			        			formatData.push(tmp);
 			        		}
 			        		treeView.treeView(container, formatData);

--
Gitblit v1.9.1