hdw
2018-12-26 b040ac179af00dfe38204ebb708aed8c87f285ad
修改内容
2个文件已添加
3个文件已修改
591 ■■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batch-set-curr.jsp 519 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/index.jsp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/base.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/mylayui.js 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
Binary files differ
gx_tieta/WebRoot/batch-set-curr.jsp
New file
@@ -0,0 +1,519 @@
<%@ 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>
    <head>
        <base href="<%=basePath%>">
        <meta charset="UTF-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <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">
        <title>批量设置信息</title>
        <link rel="stylesheet" type="text/css" href="pages/css/base.css">
        <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
        <link rel="stylesheet" type="text/css" href="src/css/layui.css">
        <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
        <style>
            .dataTypeCont {
                width: 160px;
                text-align: center;
            }
            .dataTypeCont .layui-form-switch {
                min-width: 70px;
                margin-top: 4px;
            }
        </style>
    </head>
     <body>
         <!--头部内容开始-->
        <jsp:include page="Top.jsp" flush="true"/>
        <!--头部内容结束-->
        <!--导航开始-->
        <jsp:include page="nav.jsp" flush="true"/>
        <!-- 主体内容 -->
        <div class="layui-page-container">
            <!-- 条件筛选 -->
            <div class="layui-page-filter">
                <div class="page-filter-header layui-page-filter-fweight">批量设置信息</div>
                <div class="page-filter-content">
                    <table>
                        <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
                            <td>省</td>                        <!-- 省 -->
                            <td>市</td>                        <!-- 市 -->
                             <td>区/县</td>                        <!-- 市 -->
                            <td><s:text name="Computer_name"/></td>                            <!-- 机房名称 -->
                            <td>系统类型</td>
                            <td>电池组号</td>
                        </tr>
                        <tr>
                            <td>
                                <div class="layui-form" lay-filter="provinceFilter">
                                    <div class="layui-form-item">
                                        <div class="layui-input-block">
                                            <select name="province" id="province" lay-filter="province">
                                                <option value="">请选择省</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td>
                                <div class="layui-form" lay-filter="cityFilter">
                                    <div class="layui-form-item">
                                        <div class="layui-input-block">
                                            <select name="city" id="city" lay-filter="city">
                                                <option value="">请选择市/区</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </td>
                             <td>
                                <div class="layui-form" lay-filter="countyFilter">
                                    <div class="layui-form-item">
                                        <div class="layui-input-block">
                                            <select name="county" id="county" lay-filter="county">
                                                <option value="">请选择区/县</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td>
                                <div class="layui-form" lay-filter="homeFilter">
                                    <div class="layui-form-item">
                                        <div class="layui-input-block">
                                            <select name="home" id="home" lay-filter="home" lay-search="">
                                                <option value="">请选择机房</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td>
                                   <div class="layui-form" lay-filter="sysTypeFilter">
                                       <div class="layui-form-item">
                                           <div class="layui-input-block">
                                               <select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
                                                   <option value="12">1U设备</option>
                                                <option value="2">2U设备</option>
                                            </select>
                                           </div>
                                       </div>
                                   </div>
                            </td>
                            <td>
                                   <div class="layui-form" lay-filter="battNumFilter">
                                       <div class="layui-form-item">
                                           <div class="layui-input-block">
                                               <select name="battNum" id="battNum" lay-filter="battNum" lay-search="">
                                                   <option value="0">电池组1</option>
                                                <option value="1">电池组2</option>
                                            </select>
                                           </div>
                                       </div>
                                   </div>
                            </td>
                        </tr>
                    </table>
                </div>
            </div>
            <!-- 页面主题内容 -->
            <div class="layui-page-content" style="position: relative;">
                <div class="layui-tbl-filter">
                    <div class="layui-form layui-form-pane"  lay-filter="tblFilter">
                        <div class="layui-inline">
                            <div class="layui-input-inline">
                                <div class="layui-form" lay-filter="addTypeFilter">
                                    <select name="addType" id="addType" lay-filter="addType">
                                        <option value="0">单个机房</option>
                                        <option value="5">全区/县</option>
                                        <option value="2">全市</option>
                                        <option value="1">全省</option>
                                    </select>
                                </div>
                            </div>
                        </div>
                        <button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>添加电池组</button>
                        <button class="layui-btn layui-btn-sm" id="batchSetCurr">批量设置放电参数</button>
                        <button class="layui-btn layui-btn-sm" id="batchSetSys">批量设置系统参数</button>
                        <button class="layui-btn layui-btn-sm" id="batchSetSys">批量启动放电测试</button>
                    </div>
                </div>
                <!-- 表格内容 -->
                <table id="pageTbl" lay-filter="pageTbl"></table>
            </div>
        </div>
        <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
        <script type="text/javascript" src="js/echarts.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/javascript">
            layui.use(['form', 'table', 'layer', 'element', 'laytpl'], function() {
                var table = layui.table;        // 获取表格模块
                var form = layui.form;            // 获取表单模块
                var layer = layui.layer;        // 获取弹出框模块
                var element = layui.element;    // 获取元素操作模块
                var laytpl = layui.laytpl;        // 获取模块操作
                var isNewLoad = true;
                var pre_province = getQueryString('province');
                // 查询省下拉框
                searchProvince();
                // 查询省
                var filterLoad = layer.load();
                function searchProvince() {
                    // 请求后台查询
                    $.ajax({
                        type:'post',
                        async:true,
                        url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
                        data: null,
                        dataType: 'json',
                        success:function(result) {
                            var rs = JSON.parse(result.result);
                            var list = [];                // option结果集
                            var ele = $('#province');    // 目标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, _data, {}, {});
                                    if(pre_province == _data && isNewLoad){
                                        _tmp = getLayuiSelect(_data, _data, {}, {},true);
                                    }
                                    list.push(_tmp);
                                }
                            }else {
                                list.push(getLayuiSelect('暂无省/直辖市', '', {}, undefined));
                            }
                            // 根据对象数组生成下拉列表
                            createLayuiSelect(ele, list);
                            form.render('select', 'provinceFilter');
                            // 查询市
                            searchCity();
                        }
                    });
                }
                // 切换省-市
                form.on('select(province)', function(data) {
                    // 查询市
                    searchCity(true);
                });
                // 查询市
                function searchCity(isLoad) {
                    // 构造查询条件
                    var tmp = {
                        StationName1: $("#province").val()
                    };
                    var pre_city = getQueryString('city');
                    // 是否添加等待
                    if(isLoad) {
                        filterLoad = layer.load();
                    }
                    // 根据构造条件查询内容
                    $.ajax({
                        type: 'post',
                        async: true,
                        url: 'BattInfAction!serchStationName2',
                        dataType: 'json',
                        data: "json = "+JSON.stringify(tmp),
                        success: function(result) {
                            var rs = JSON.parse(result.result);
                            var list = [];                // option结果集
                            var ele = $('#city');    // 目标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.StationName2, _data.StationName2, {}, _data);
                                    if(pre_city == _data.StationName2 && isNewLoad){
                                        _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
                                    }
                                    list.push(_tmp);
                                }
                            }else {
                                list.push(getLayuiSelect('暂无市/区', '', {}, undefined));
                            }
                            // 根据对象数组生成下拉列表
                            createLayuiSelect(ele, list);
                            form.render('select', 'cityFilter');
                            // 查询区县
                            searchCounty();
                        }
                    });
                }
                // 切换市-区县
                form.on('select(city)', function(data) {
                    // 查询区县
                    searchCounty(true);
                });
                // 查询区/县
                function searchCounty(isLoad) {
                    // 构造查询条件
                    var tmp = {
                        StationName1: $("#province").val(),
                        StationName2: $("#city").val()
                    };
                    // 是否添加等待
                    if(isLoad) {
                        filterLoad = layer.load();
                    }
                    var pre_county = getQueryString('county');
                    // 根据构造条件查询内容
                    $.ajax({
                        type: 'post',
                        async: true,
                        url: 'BattInfAction!serchStationName5',
                        dataType: 'json',
                        data: "json = "+JSON.stringify(tmp),
                        success: function(result) {
                            var rs = JSON.parse(result.result);
                            //console.info(rs);
                            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);
                                    if(pre_county ==  _data.StationName5 && isNewLoad){
                                        _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
                                    }
                                    //console.info(_tmp);
                                    list.push(_tmp);
                                }
                            }else {
                                list.push(getLayuiSelect('暂无区/县', '', {}, undefined));
                            }
                            // 根据对象数组生成下拉列表
                            createLayuiSelect(ele, list);
                            form.render('select', 'countyFilter');
                            // 查询机房
                            searchHome();
                        }
                    });
                }
                // 切换市-区县
                form.on('select(county)', function(data) {
                    // 查询区县
                    searchHome(true);
                });
                // 查询机房
                function searchHome(isLoad) {
                    // 构造查询条件
                    var tmp = {
                        StationName1:$("#province").val(),
                        StationName2:$("#city").val(),
                        StationName5:$("#county").val(),
                    };
                    var pre_home = getQueryString('home');
                    var auto_seach = false;
                    // 是否添加等待
                    if(isLoad) {
                        filterLoad = layer.load();
                    }
                    // 根据构造条件查询内容
                    $.ajax({
                        type: 'post',
                        async: true,
                        url: 'BattInfAction!serchStationName3',
                        dataType: 'json',
                        data: "json = "+JSON.stringify(tmp),
                        success: function(result) {
                            var rs = JSON.parse(result.result);
                            var list = [];                // option结果集
                            var ele = $('#home');    // 目标select
                            if(rs.code == 1) {
                                var data = rs.data;
                                list.push(getLayuiSelect('请选择机房', '', {StationId: '', dev_id: ''}, undefined));
                                // 遍历查询结果
                                for(var i=0; i<data.length; i++) {
                                    var _data = data[i];
                                    var _attr = {
                                        StationId: _data.StationId,
                                        dev_id: _data.FBSDeviceId
                                    };
                                    var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
                                    if(pre_home == _data.StationName && isNewLoad){
                                        _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data,true);
                                        auto_seach = true;
                                    }
                                    list.push(_tmp);
                                }
                            }else {
                                list.push(getLayuiSelect('暂无机房', '', {}, undefined));
                            }
                            // 根据对象数组生成下拉列表
                            createLayuiSelect(ele, list);
                            form.render('select', 'homeFilter');
                            isNewLoad = false;
                            layer.close(filterLoad);
                        }
                    });
                }
                // 切换机房
                form.on('select(home)', function(data) {
                });
                // 表格模块
                var tOptions = {
                    elem: '#pageTbl'
                    ,toolbar: true
                    ,defaultToolbar: []
                    ,cellMinWidth: 80
                    ,cols: [[
                        {type:'checkbox',fixed: 'left'}
                        ,{field:'StationName', title:'机房名称', align:'center', width: 360}
                        ,{field:'FBSDeviceName', title:'FBS设备名称', align:'center', width: 160}
                        ,{field:'GroupIndexInFBSDevice', title:'FBS设备索引', align:'center', width: 160}
                        ,{field:'BattGroupId', title:'电池组ID', align:'center', width: 160}
                        ,{field:'BattGroupNum', title:'机房内电池组编号', align:'center', width: 160}
                        ,{field:'BattGroupName', title:'电池组名称', align:'center', width: 160}
                        ,{field:'FloatVolLevel', title:'浮充电压阀值', align:'center', width: 160}
                        ,{field:'OfflineVolLevel', title:'离线电压阀值', align:'center', width: 160}
                        ,{field:'BattFloatCurrent', title:'浮充阀值', align:'center', width: 100}
                        ,{field:'MonCount', title:'单体数量', align:'center', width: 100}
                        ,{field:'MonCapStd', title:'标称容量', align:'center', width: 100}
                        ,{field:'MonVolStd', title:'标称单体电压', align:'center', width: 140}
                        ,{field:'MonResStd', title:'标称单体内阻', align:'center', width: 140}
                        ,{field:'MonSerStd', title:'标称单体电导', align:'center', width: 140}
                        ,{field:'MonVolLowToAvg', title:'单体电压次低偏移量', align:'center', width: 140}
                        ,{field:'Load_curr', title:'负载电流', align:'center', width: 140}
                        ,{field:'DisCurrMax', title:'最大核容电流', align:'center', width: 140}
                        ,{field:'station_phone', title:'基站手机号码', align:'center', width: 140}
                        ,{field:'BattProducer', title:'电池品牌', align:'center', width: 140}
                        ,{field:'BattModel', title:'电池型号', align:'center', width: 260}
                    ]]
                    ,data:[]
                    ,limit: 20
                    ,page: true
                    ,height: 'full-252'
                };
                // 生成表格数据
                table.render(tOptions);
                // 更新表格的对象
                var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
                // 查询后台数据
                // 点击添加电池组
                $('#batchAdd').click(function() {
                    var structData = structAddData();
                    // 判断是否选择要添加的内容
                    if(structData.msg) {
                        layer.msg(structData.msg);
                        return;
                    }
                    // 弹出设置选择筛选条件
                    search(structData);
                });
                // 根据查询条件查询内容
                function search(temp) {
                    var load = layer.load(1);
                    // 查询后台
                    $.ajax({
                        type: 'post'
                        ,async: true
                        ,url: 'BattInfAction!serchByDischarge'
                        ,data: 'json='+JSON.stringify(temp)
                        ,dataType: 'json'
                        ,success: function(res) {
                            console.log(res);
                            var rs = JSON.parse(res.result);
                            if(rs.code == 1) {
                                var data = rs.data;
                                console.log(data);
                                tOptions.data = data;
                                // 生成表格数据
                                table.render(tOptions);
                            }else {
                                layer.msg('没有可设置的电池组!');
                            }
                        }
                        ,complete:function() {
                            layer.close(load);
                        }
                    });
                }
                // 点击添加构造查询
                function structAddData() {
                    //1省(文本值)              2:市(文本值)            5:区县(文本值)            0:机房  (设备id)
                    var addType = $('#addType').val();    // 添加机房的方式
                    var msg = '';    // 提示信息
                    var rs = {
                        num: addType,
                        StationName: '',
                        GroupIndexInFBSDevice: $('#battNum').val(),
                        MonVolStd: $('#sysType').val()
                    };
                    switch(addType) {
                        case '1':
                            var province = $('#province').val();
                            rs.StationName = province;
                            msg = '请选择省';
                        break;
                        case '2':
                            var city = $('#city').val();
                            rs.StationName = city;
                            msg = '请选择市';
                        break;
                        case '5':
                            var county = $('#county').val();
                            rs.StationName = county;
                            msg = '请选择区/县';
                        break;
                        case '0':
                            var home = $('#home').find('option:selected').attr('stationid');
                            rs.StationName = home;
                            msg = '请选择机房';
                        break;
                    }
                    if(!rs.StationName) {
                        rs.msg = msg;
                    }
                    return rs;
                }
            });
        </script>
    </body>
</html>
gx_tieta/WebRoot/index.jsp
@@ -1705,7 +1705,7 @@
    // 生成图标的说明
    function createIconExplain(mapEle) {
        var iconExplain = $('<div id="mapImgDesc" style="position:absolute;background-color: #fff; border: 1px solid #ccc; right: 10px; bottom: 10px; z-index: 99999"></div>');    // 地图图标说明容器
        var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">地图图标说明<img src="image/explain-down.gif" style="float:right;"/></div>');
        var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">图标显示与选择<img src="image/explain-down.gif" style="float:right;"/></div>');
        iconExplain.append(iconExplainHt);
        
        changeMapImgDesc(iconExplain, 'normal');
gx_tieta/WebRoot/js/base.js
@@ -623,6 +623,11 @@
            }
            totalAlm_num=model.sum;
            
            // 5秒后关闭面板
            setTimeout(function() {
                $('body').children('#eleWarning').remove();
            }, 5000);
            self.setTimeout("searchAlm()",10000); 
        }
    });    
gx_tieta/WebRoot/pages/js/mylayui.js
@@ -389,3 +389,68 @@
    }
};
//layui表格内容更新
var LayuiTbl = function(options, layui, laytpl, cache) {
    this.opts = options;
    this.cache = cache;
    this.layui = layui;
    this.tpl = laytpl;
    this.ele = options.elem;
    this.col = options.cols[0];
};
// 设置原型函数
LayuiTbl.prototype = {
    updateTr: function(index, data) {
        var layui = this.layui;
        var preData = this.cache[index];
        var _data = $.extend(preData, data||{});
        var tds = this._getBodyTds(index);
        console.log(preData);
        // 遍历
        var _this = this;
        layui.each(_data, function(key, value) {
            // 遍历tds的值
            tds.each(function() {
                var _field = $(this).data('field');
                if(key == _field) {
                    var cell = $(this).find('.layui-table-cell');
                    var content = _this._getContent(key, value, _data);
                    cell.html(content);
                }
            });
        });
    }
    ,_getBodyTds: function(index) {
        var layuiTableView = $(this.ele).next('.layui-table-view');
        var layuiTableBody = layuiTableView.find('.layui-table-body .layui-table tbody');
        var trList = layuiTableBody.find('tr');
        return trList.eq(index).find('td');
    }
    ,_getContent: function(key, value, data) {
        var col = this.col;             //  所有的列
        var laytpl = this.tpl;
        var rs = '';
        var templet = '';
        // 遍历所有的列
        for(var i=0; i<col.length; i++) {
            var _col = col[i];
            // 判断当前内容是否为对应的需要更新的数据
            if(key == _col.field) {
                // 判断是否有模板
                templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value;
                // 根据模板构成content
                laytpl(templet).render(data, function(html) {
                    rs = html;
                });
                return rs;
            }
        }
        return false;
    }
};