From cb17f57c1c6408787934ed500a4fb37adefd6d5c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 11:36:53 +0800
Subject: [PATCH] 电池续航能力历史查询
---
gx_tieta/WebRoot/set-match-group.jsp | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp
index 1b5c3fd..6a9b6f6 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">
@@ -23,6 +23,7 @@
<link rel="stylesheet" type="text/css" href="css/basic.css" />
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" href="pages/css/common.css">
+ <link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
html, body {
height: 100%;
@@ -80,7 +81,7 @@
</div>
</div>
- <button class="layui-btn layui-btn-sm layui-btn-normal" id="search"><i class="fa fa-search"></i> 鏌ヨ</button>
+ <button class="layui-btn layui-btn-sm" id="search"><i class="fa fa-search"></i> 鏌ヨ</button>
</div>
</div>
@@ -90,19 +91,19 @@
</div>
</div>
</div>
+ <div id="setMatchGroupData"></div>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<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'
@@ -133,25 +134,104 @@
var groupData = $('#group').find('option:selected').data('data');
// 鍒ゆ柇鏄惁宸茬粡閫変腑鐢垫睜缁�
if(groupData) {
- console.log(groupData);
+ 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();
+ case 'matchGroup':
+ showMatchGroupPanel(obj.data);
break;
}
});
// 鏄剧ず鏇存崲鐢垫睜鍗曚綋闈㈡澘
- function showReplacePanel() {
-
+ function showMatchGroupPanel(obj) {
+ $('#setMatchGroupData').data('data', obj);
+ // 璁剧疆寮瑰嚭妗嗙殑title鐨勫��
+ var txt = obj.stationname+'-'+obj.groupname+'-'+obj.monnum+'('+obj.brandname+')';
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">閰嶇粍锛�</span>'+txt,
+ area: ['1200px', '500px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/set-match-group.html'
+ });
}
// 鏌ヨ鐪佷笅鎷夋
@@ -271,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 {
@@ -338,45 +418,6 @@
form.render('select', 'groupFilter');
}
});
- }
-
- // 鐢熸垚鐗瑰畾鐨剆elect鍒楄〃
- function createLayuiSelect(ele, list) {
- // 娓呯┖鍐呭
- ele.text('');
- // 閬嶅巻list缁撴灉闆嗙敓鎴愪笅鎷�
- for(var i=0; i<list.length; i++) {
- var _list = list[i];
- var option = $('<option></option>'); // option鍏冪礌
- // 璁剧疆option鐨勬枃鏈�/灞炴�у��/data鍊�
- option.text(_list.txt);
- option.val(_list.val);
- option.data('data', _list.data);
- Object.keys(_list.attr).forEach(function(key){
- var val = _list.attr[key];
- option.attr(key, val);
- });
- ele.append(option);
- }
- }
-
- // 鏋勯�犵敓鎴恠elect鍒楄〃鐨勫璞℃暟缁�
- function getLayuiSelect(txt, val, attr, data) {
- var obj = {
- val: '',
- txt: '',
- attr: {},
- data: {}
- };
-
- // 璁剧疆鍐呭鐨勫��
- obj.val = val; // option鐨剉alue鍊�
- obj.txt = txt; // option鐨勬枃鏈��
- obj.attr = attr; // option鐨勮嚜瀹氫箟鐨勫睘鎬�
- obj.data = data; // option鐨刣ata鍊�
-
- // 杩斿洖鏋勯�犵殑瀵硅薄
- return obj;
}
});
</script>
--
Gitblit v1.9.1