From 5eccf7914f844961d5d0a63071d1c89c0b5b32f1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 11 十月 2018 15:34:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/set-match-group.jsp | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index 34b0406..36e8c4b 100644
--- a/gx_tieta/WebRoot/set-match-group.jsp
+++ b/gx_tieta/WebRoot/set-match-group.jsp
@@ -97,15 +97,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 +134,99 @@
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.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,
@@ -289,7 +351,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 {
--
Gitblit v1.9.1