From deab7d04e83c1eada95ff1474b4fe272b907a06f Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期三, 16 一月 2019 16:31:19 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/set-match-group.jsp | 190 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 163 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index 34b0406..7a65063 100644
--- a/gx_tieta/WebRoot/set-match-group.jsp
+++ b/gx_tieta/WebRoot/set-match-group.jsp
@@ -13,7 +13,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE10" />
<meta charset="UTF-8">
-<title>鐢垫睜缁勯厤缁勭鐞�</title>
+<title>鐢垫睜缁勯厤缁勮褰�</title>
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="0">
@@ -60,7 +60,14 @@
<div class="layui-input-inline">
<div class="layui-form" lay-filter="cityFilter">
<select name="city" id="city" lay-filter="city">
- <option value="">璇烽�夋嫨甯�/鍖�</option>
+ <option value="">璇烽�夋嫨甯�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-input-inline">
+ <div class="layui-form" lay-filter="countyFilter">
+ <select name="county" id="county" lay-filter="county">
+ <option value="">璇烽�夋嫨鍖�/鍘�</option>
</select>
</div>
</div>
@@ -70,7 +77,6 @@
<option value="">璇烽�夋嫨鏈烘埧</option>
</select>
</div>
-
</div>
<div class="layui-input-inline">
<div class="layui-form" lay-filter="groupFilter">
@@ -97,15 +103,13 @@
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="pages/js/mylayui.js"></script>
<script type="text/html" id="toolBar">
- <a class="layui-btn layui-btn-xs" lay-event="replace">鏇存崲</a>
+ <a class="layui-btn layui-btn-xs" lay-event="matchGroup">閰嶇粍</a>
</script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
,table = layui.table // 鑾峰彇table妯″潡
- ,form = layui.form
- ,laytpl = layui.laytpl
- ,element = layui.element;
+ ,form = layui.form;
// 琛ㄦ牸鏁版嵁閰嶇疆椤�
var tOptions = {
elem: '#groupTbl'
@@ -136,35 +140,100 @@
var groupData = $('#group').find('option:selected').data('data');
// 鍒ゆ柇鏄惁宸茬粡閫変腑鐢垫睜缁�
if(groupData) {
- $('#setMatchGroupData')
- console.log(groupData);
- tOptions.data = [{}];
- table.render(tOptions);
+ searchData(groupData);
}else {
tOptions.data = [];
table.render(tOptions);
layer.msg('璇烽�夋嫨涓�缁勭數姹�');
}
});
+
+ // 鏌ヨ鐢垫睜缁勪笅鎵�鏈夌殑鍗曚綋
+ function searchData(obj) {
+ // 娣诲姞绛夊緟妗�
+ var loading = layer.load(0, {shade: [0.1,'#fff']}); //0浠ｈ〃鍔犺浇鐨勯鏍硷紝鏀寔0-2
+ var structData = structSearchData(obj);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url:'BattInfAction!serchGroupByInfor',
+ data: 'json='+JSON.stringify(structData),
+ dataType: 'json',
+ success: function(result) {
+ layer.close(loading); // 鍏抽棴绛夊緟妗�
+ var rs = JSON.parse(result.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ var num = 0;
+ var rsData = formaterTblData(data);
+ num = rsData.length;
+ tOptions.data = rsData;
+ // 璁剧疆鍒嗛〉淇℃伅
+ tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞�
+ tOptions.page.limit= num;
+ tOptions.page.limits = [num];
+ }
+ // 閲嶆柊缁樺埗琛ㄦ牸鍐呭
+ table.reload('groupTbl', tOptions);
+ }
+ });
+ }
+
+ // 鏋勯�犳煡璇㈠璞�
+ function structSearchData(data) {
+ var obj = {};
+ obj.StationName1 = '';
+ obj.StationName2 = '';
+ obj.StationName5 = '';
+ obj.StationName3 = '';
+ obj.BattGroupName = '';
+ obj.BattGroupId = data.BattGroupId;
+ return obj;
+ }
+
+ // 鏋勯�犵敓鎴愯〃鏍兼暟鎹殑鏂规硶
+ function formaterTblData(data) {
+ var rs = []; // 缁撴灉闆�
+ console.log(data);
+ // 閬嶅巻鏌ヨ鐨勭粨鏋滄牴鎹煡璇㈢粨鏋滅敓鎴愭寚瀹氱殑鏍煎紡
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var obj = {};
+ obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О
+ obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
+ obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇
+ obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺
+ obj.monnum = '#'+_data.MonNum; // 鍗曚綋缂栧彿
+ obj.brandname = _data.BattProducer; // 鍝佺墝
+ // 涓嶆樉绀哄唴瀹�
+ obj.num = _data.MonNum; // 鍗曚綋缂栧彿涓嶅姞#
+ obj.battgroupid = _data.BattGroupId; // 鐢垫睜缁刬d
+ obj.stationid = _data.StationId; // 鏈烘埧id
+ rs.push(obj);
+ }
+
+ return rs; // 杩斿洖缁撴灉闆�
+ }
// 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹�
table.on('tool(groupTbl)', function(obj) {
var event = obj.event;
switch(event) {
- case 'replace':
- showReplacePanel(obj.data);
+ case 'matchGroup':
+ showMatchGroupPanel(obj.data);
break;
}
});
// 鏄剧ず鏇存崲鐢垫睜鍗曚綋闈㈡澘
- function showReplacePanel(obj) {
+ function showMatchGroupPanel(obj) {
$('#setMatchGroupData').data('data', obj);
-
+ // 璁剧疆寮瑰嚭妗嗙殑title鐨勫��
+ var txt = obj.stationname+'-'+obj.groupname+'-'+obj.monnum+'('+obj.brandname+')';
// 鏄剧ず闈㈡澘
layer.open({
type: 2,
- title: '鏇存崲鐢垫睜',
+ title: '<span style="font-weight:bold">閰嶇粍锛�</span>'+txt,
area: ['1200px', '500px'],
fixed: false, //涓嶅浐瀹�
maxmin: true,
@@ -173,6 +242,7 @@
}
// 鏌ヨ鐪佷笅鎷夋
+ var filterLoad = layer.load();
searchProvince();
// 鏌ヨ鐪�
function searchProvince() {
@@ -213,15 +283,19 @@
// 鍒囨崲鐪�-甯�
form.on('select(province)', function(data) {
// 鏌ヨ甯�
- searchCity();
+ searchCity(true);
});
// 鏌ヨ甯�
- function searchCity() {
+ function searchCity(isLoad) {
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1: $("#province").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -235,7 +309,7 @@
var ele = $('#city'); // 鐩爣select
if(rs.code == 1) {
var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+ list.push(getLayuiSelect('璇烽�夋嫨甯�', '', {}, undefined));
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -243,12 +317,56 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+ list.push(getLayuiSelect('鏆傛棤甯�', '', {}, undefined));
}
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
createLayuiSelect(ele, list);
form.render('select', 'cityFilter');
+ // 鏌ヨ鍖�/鍘�
+ searchCounty();
+ }
+ });
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ function searchCounty(isLoad) {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1: $("#province").val(),
+ StationName2: $("#city").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName5',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#county'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'countyFilter');
// 鏌ヨ鏈烘埧
searchHome();
@@ -256,19 +374,31 @@
});
}
- // 鍒囨崲甯�-鏈烘埧
+
+ // 鍒囨崲甯�-鍖�/鍘�
form.on('select(city)', function(data) {
+ // 鏌ヨ鍖�/鍘�
+ searchCounty(true);
+ });
+
+ // 鍒囨崲鍖�/鍘�-鏈烘埧
+ form.on('select(county)', function(data) {
// 鏌ヨ鏈烘埧
- searchHome();
+ searchHome(true);
});
// 鏌ヨ鏈烘埧
- function searchHome() {
+ function searchHome(isLoad) {
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#province").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -289,7 +419,7 @@
var _attr = {
StationId: _data.StationId
};
- var _tmp = getLayuiSelect(_data.StationName3, _data.StationName, _attr, _data);
+ var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
list.push(_tmp);
}
}else {
@@ -313,14 +443,19 @@
});
// 鏌ヨ鏈烘埧
- function searchGroup() {
+ function searchGroup(isLoad) {
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#province").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#home").val(),
StationId: $("#home").find('option:selected').attr('stationid')
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -348,9 +483,10 @@
list.push(_tmp);
}
}else {
- list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+ list.push(getLayuiSelect('鏆傛棤鐢垫睜缁�', '', {}, undefined));
}
+ layer.close(filterLoad);
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
createLayuiSelect(ele, list);
form.render('select', 'groupFilter');
--
Gitblit v1.9.1