hdw
2018-10-10 943651096ffe71d38311b77612b902410f3d269e
更换电池单体
1个文件已添加
2个文件已修改
258 ■■■■■ 已修改文件
gx_tieta/WebRoot/ele-match-group.jsp 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/css/common.css 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/set-match-group.jsp 178 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,18 +268,23 @@
                    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));    // 容量百分比
                        // 判断电池单体不存在
                        if(__data.mon_num != -1) {
                        rs.push(_obj);
                    }
                }
                }
                
                return rs;    // 返回结果集
            }
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%;
@@ -750,3 +745,60 @@
.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;
}
gx_tieta/WebRoot/set-match-group.jsp
New file
@@ -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:'标称电压(V)', 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>