From bba339575f11b6922b7cadda4eca2dddaa728e08 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期四, 03 一月 2019 16:11:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-match-group.jsp | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 461c9c3..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浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+ var loading = layer.load(1, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
$.ajax({
type: 'post',
url: 'BattInfAction!serchMakeGroup',
@@ -233,7 +233,7 @@
if(rs.code == 1) {
var data = rs.data;
var num = 0;
- console.log(data);
+ //console.log(data);
var rsData = formaterTblData(data);
// 璁剧疆琛ㄦ牸鐨勬暟鎹�
num = rsData.length;
@@ -297,6 +297,7 @@
// 绗﹀悎鏉′欢鍚敤鏋勯�犲璞�
var temp = {
StationName2: attr.StationName2,
+ StationName5: '',
BattProducer: 1
};
@@ -476,7 +477,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 +510,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);
@@ -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