From 943651096ffe71d38311b77612b902410f3d269e Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期三, 10 十月 2018 13:23:40 +0800 Subject: [PATCH] 更换电池单体 --- gx_tieta/WebRoot/set-match-group.jsp | 178 +++++++++++++++++++++++++++++++++++ gx_tieta/WebRoot/pages/css/common.css | 62 +++++++++++- gx_tieta/WebRoot/ele-match-group.jsp | 20 +++ 3 files changed, 252 insertions(+), 8 deletions(-) diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp index 3116a56..2a4e5a6 100644 --- a/gx_tieta/WebRoot/ele-match-group.jsp +++ b/gx_tieta/WebRoot/ele-match-group.jsp @@ -24,6 +24,11 @@ <link rel="stylesheet" href="css/common.css"> <link rel="stylesheet" href="pages/css/common.css"> <style type="text/css"> + #main { + position: absolute; + top: 124px; + bottom: 32px; + } #sideBar { height: 100%; } @@ -32,6 +37,9 @@ } .layui-form-radio { margin-right: 10px !important; + } + .layui-table-view { + margin: 0; } </style> </head> @@ -145,7 +153,7 @@ ] ,page: {} - ,height: 'full-170' + ,height: 'full-165' }; var toolBarTpl = groupTblTools.innerHTML; @@ -228,6 +236,7 @@ if(rs.code == 1) { var data = rs.data; var num = 0; + console.log(data); var rsData = formaterTblData(data); // 璁剧疆琛ㄦ牸鐨勬暟鎹� num = rsData.length; @@ -259,16 +268,21 @@ var obj = {}; obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉� - obj.brandname = _data.BattProducer; // 鍝佺墝 obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇 obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺 for(var k=0; k<_data.obj.length;k++) { var _obj = $.extend({}, obj); var __data = _data.obj[k]; + // 璁剧疆鍗曚綋淇℃伅 _obj.monnum = '#'+__data.mon_num; // 鍗曚綋缂栧彿 + _obj.brandname = __data.note; // 鍝佺墝 _obj.relcap = Number(__data.test_cap.toFixed(1)); // 瀹為檯瀹归噺 _obj.percap = Number((__data.percent*100).toFixed(1)); // 瀹归噺鐧惧垎姣� - rs.push(_obj); + + // 鍒ゆ柇鐢垫睜鍗曚綋涓嶅瓨鍦� + if(__data.mon_num != -1) { + rs.push(_obj); + } } } diff --git a/gx_tieta/WebRoot/pages/css/common.css b/gx_tieta/WebRoot/pages/css/common.css index 35184c7..d43849a 100644 --- a/gx_tieta/WebRoot/pages/css/common.css +++ b/gx_tieta/WebRoot/pages/css/common.css @@ -737,11 +737,6 @@ background-image: linear-gradient(#3072b3, #599bdc); } /* page layui */ -#main { - position: absolute; - top: 124px; - bottom: 32px; -} .whyc-page-content-layui { position: relative; width: 100%; @@ -749,4 +744,61 @@ } .side-bar-container { height: 100%; +} + +.whyc-page-layui-header { + height: 80px; + background-color: #F03AF6; +} +.whyc-page-layui-nav { + height: 40px; + background-color: #4BF50F; +} +.whyc-page-layui-main { + position: absolute; + top: 120px; + bottom: 30px; + left: 0; + right: 0; + overflow: hidden; + background-color: #7E7878; +} +.whyc-page-layui-content-container { + position: relative; + height: 100%; + background-color: #FFFFFF; +} +.whyc-page-layui-siderbar { + position: absolute; + top: 0; + bottom: 0; + left: 0; + background-color: #C3BEBE; +} + +.whyc-page-layui-content { + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; + overflow: hidden; + overflow-y: auto; +} +.whyc-page-filter { + background-color: #FFFFFF; + overflow:hidden; +} +.tbl-container { + position: relative; + width: 100%; + height: 100%; + background-color: #FFFFFF; +} +.tbl-filter { + position: absolute; + top: 4px; + left: 0; + z-index: 891; + padding-left: 10px; } \ No newline at end of file diff --git a/gx_tieta/WebRoot/set-match-group.jsp b/gx_tieta/WebRoot/set-match-group.jsp new file mode 100644 index 0000000..eb0482d --- /dev/null +++ b/gx_tieta/WebRoot/set-match-group.jsp @@ -0,0 +1,178 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> +<%@ taglib uri="/struts-tags" prefix="s"%> +<!DOCTYPE HTML> +<html class="h"> +<head> +<base href="<%=basePath%>"> + +<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE10" /> +<meta charset="UTF-8"> +<title>鐢垫睜缁勯厤缁勭鐞�</title> + <meta http-equiv="pragma" content="no-cache"> + <meta http-equiv="cache-control" content="no-cache"> + <meta http-equiv="expires" content="0"> + <meta http-equiv="keywords" content="keyword1,keyword2,keyword3"> + <meta http-equiv="description" content="This is my page"> + <link rel="stylesheet" href="src/css/layui.css"> + <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"> + <style type="text/css"> + html, body { + height: 100%; + } + body { + overflow:hidden; + } + .layui-table-view { + margin: 0; + } + </style> + </head> + + <body> + <!--澶撮儴鍐呭寮�濮�--> + <jsp:include page="Top.jsp" flush="true"/> + <!--澶撮儴鍐呭缁撴潫--> + <!-- 瀵艰埅寮�濮� --> + <jsp:include page="nav.jsp" flush="true"/> + <div class="whyc-page-layui-main"> <!-- 鏈�澶栧眰鎺у埗浣嶇疆 --> + <div class="whyc-page-layui-content-container"> + <div class="whyc-page-layui-content" style="background-color: pink"> + <div class="tbl-container"> + <div class="tbl-filter" lay-filter="tblFilter"> + <div class="layui-form layui-form-pane"> + <div class="layui-inline"> + <div class="layui-input-inline"> + <select name="province" id="province"> + <option value="">璇烽�夋嫨鐪�/鐩磋緰甯�</option> + </select> + </div> + <div class="layui-input-inline"> + <select name="city" id="city" lay-filter="city"> + <option value="">璇烽�夋嫨甯�/鍖�</option> + </select> + </div> + <div class="layui-input-inline"> + <select name="home" id="home" lay-search=""> + <option value="">璇烽�夋嫨鏈烘埧</option> + </select> + </div> + <div class="layui-input-inline"> + <select name="group" lay-filter="group" lay-search="" id="group"> + <option value="">璇烽�夋嫨鐢垫睜缁�</option> + </select> + </div> + </div> + <button class="layui-btn layui-btn-sm layui-btn-normal" id="search"><i class="fa fa-search"></i> 鏌ヨ</button> + </div> + + </div> + <!-- 琛ㄦ牸鍐呭 --> + <table id="groupTbl" lay-filter="groupTbl"></table> + </div> + </div> + </div> + </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/html" id="toolBar"> + <a class="layui-btn layui-btn-xs" lay-event="replace">鏇存崲</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; + // 琛ㄦ牸鏁版嵁閰嶇疆椤� + var tOptions = { + elem: '#groupTbl' + ,toolbar: true + ,defaultToolbar: ['exports', 'filter'] + ,cellMinWidth: 80 + ,cols: [[ + {field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380} + ,{field:'groupname', title:'鐢垫睜缁勫悕绉�', align:'center'} + ,{field:'monnum', title:'鍗曚綋缂栧彿', align:'center'} + ,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'} + ,{field:'nominalcap', title:'鏍囩О瀹归噺', align:'center'} + ,{field:'monvol', title:'鏍囩О鐢靛帇锛圴锛�', align:'center'} + ,{field:'relcap', title:'瀹為檯瀹归噺', align:'center'} + ,{field:'percap', title:'瀹归噺鐧惧垎姣�(%)', align:'center'} + ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#toolBar', width: 70} + ]] + ,data:[] + ,page: { + layout:['count', 'prev', 'page', 'next'] + } + ,height: 'full-150' + }; + + // 鐢熸垚琛ㄦ牸鏁版嵁 + table.render(tOptions); + + // 鐐瑰嚮鏌ヨ鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勭殑鍗曚綋鍒楄〃 + $('#search').click(function() { + var data = [{stationname: 'xxx'},{stationname: 'enen'}]; + var num = data.length; + tOptions.data = data; + // 璁剧疆鍒嗛〉淇℃伅 + // tOptions.page.layout = ['count', 'prev', 'page', 'next']; //鑷畾涔夊垎椤靛竷灞� + tOptions.page.limit = num; + tOptions.page.limits = [num]; + // 閲嶆柊缁樺埗琛ㄦ牸 + table.reload('groupTbl', tOptions); + }); + + // 鍒囨崲绛涢�夋潯浠舵ā鍧� + form.on('select(group)', function(data) { + var dom = data.elem; + var $dom = $(dom); + console.log($dom.find('option:selected').data()); + }); + + + // 鐐瑰嚮琛ㄦ牸宸ュ叿鏍忔洿鎹� + table.on('tool(groupTbl)', function(obj) { + var event = obj.event; + switch(event) { + case 'replace': + showReplacePanel(); + break; + } + }); + + // 鏄剧ず鏇存崲鐢垫睜鍗曚綋闈㈡澘 + function showReplacePanel() { + + } + + searchProvince(); + + // 鏌ヨ鐪佺殑鍒楄〃 + function searchProvince() { + // 璇锋眰鍚庡彴鏌ヨ + $.ajax({ + type:'post', + async:true, + url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup', + data: null, + dataType: 'json', + success:function(result) { + var rs = result.result; + } + }); + } + }); + </script> + </body> +</html> -- Gitblit v1.9.1