whyclj
2019-02-21 492155ca65497b33a1911bd862184ed50a4989a7
Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/gx_tieta.git into dev_lxw
4个文件已添加
5个文件已修改
1341 ■■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_replaceImpl$1.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_replaceImpl.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ele-change-manage.jsp 586 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/ele-change-manage-add.html 483 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/ele-change-manage-edit.html 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/voltageMbargraph.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/css/layui-base.css 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/mylayui.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Batt_replaceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_replaceImpl$1.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_replaceImpl.class
Binary files differ
gx_tieta/WebRoot/ele-change-manage.jsp
New file
@@ -0,0 +1,586 @@
<%@ 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">
    </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>                            <!-- 机房名称 -->
                        </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"  lay-search="">
                                                <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>
                        </tr>
                    </table>
                </div>
            </div>
            <!-- 页面主题内容 -->
            <div class="layui-page-content" style="position: relative;">
                <!-- 表格内容 -->
                <table id="pageTbl" lay-filter="pageTbl"></table>
            </div>
            <div class="data-footer">
                <!-- 分页内容 -->
                <div id="paging">
                    <a href="javascript:" class="search"><s:text name="Search"/></a>        <!-- 查询 -->
                    <a href="javascript:" id="export_table"><s:text name="Export"/></a>        <!-- 导出 -->
                    <span id="current">1/1</span>
                    <span><s:text name="Each_page"/><input type="text" id="number" value="10"/><s:text name="Item"/></span>
                    <s:text name="Total_data"/><!-- 数据总量 --><span id="total">0</span>&nbsp;
                    <a href="javascript:" id="page_home"><s:text name="HomePage"/></a>
                    <a href="javascript:" id="page_pre"><s:text name="Page_Up"/></a>
                    <a href="javascript:" id="page_next_p"><s:text name="Page_Down"/></a>
                    <a href="javascript:" id="page_last"><s:text name="End_Page"/></a>
                    <span id="cont">
                        <s:text name="Goto"/><input type="text" id="page_num" value="1"/>
                        <a href="javascript:" id="page_go"><s:text name="Jump"/></a>
                    </span>
                    <a href="javascript:" id="new_add">新建</a>
                </div>
            </div>
        </div>
        <!-- 存储iframe的值 -->
        <div id="iframeData"></div>
        <script type="text/html" id="doThings">
            <a class="layui-btn layui-btn-xs layui-btn-blue" lay-event="edit">修改</a>
            <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">删除</a>
        </script>
        <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/javascript">
            var permits;
            <%    Object obj=session.getAttribute("permits");
                if(obj!=null){
                    String permits =obj.toString();  %>
                    permits=<%=permits%>;
                    //console.info(json);
            <%    }    %>
            layui.use(['form', 'table', 'layer', 'element'], function() {
                /* 页面导入layui模块 */
                var table = layui.table;        // 获取表格模块
                var form = layui.form;            // 获取表单模块
                var layer = layui.layer;        // 获取弹出框模块
                var element = layui.element;    // 获取元素操作模块
                var laytpl = layui.laytpl;        // 获取模板操作模块
                /* 分页信息模块 */
                var Page = new TblPage();    // 实例化TblPage对象--验收的的审核信息
                Page.set(1, 0, 20);            // 初始化值
                // 页面dom对象
                var pagePage = new PagePage({
                    search: $('#paging .search')        // 查询
                    ,home: $('#page_home')                // 首页
                    ,pre: $('#page_pre')
                    ,next: $('#page_next_p')
                    ,last: $('#page_last')
                    ,num: $('#page_num')
                    ,go: $('#page_go')
                    ,total: $('#total')
                    ,size: $('#number')
                    ,current: $('#current')
                });
                pagePage.init(Page, search);
                // 省-市-区县-机房联动
                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;
                                var allTxt = "<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)";
                                list.push(getLayuiSelect(allTxt, '', {}, 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;
                                var allTxt = "<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)";
                                list.push(getLayuiSelect(allTxt, '', {}, 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 list = [];                // option结果集
                    var ele = $('#county');    // 目标select
                    // 判断必要条件是否存在
                    var parentStatus = checkLayuiParent($("#city"));
                    if(!parentStatus) {
                        layer.close(filterLoad);    // 关闭等待框
                        list.push(getLayuiSelect('请先选择市', '', {}, undefined));
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'countyFilter');
                        // 查询机房
                        searchHome();
                        return;
                    }
                    // 构造查询条件
                    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;
                                var allTxt = "<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)";
                                list.push(getLayuiSelect(allTxt, '', {}, 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 list = [];                // option结果集
                    var ele = $('#home');    // 目标select
                    // 判断必要条件是否存在
                    var parentStatus = checkLayuiParent($("#county"));
                    if(!parentStatus) {
                        layer.close(filterLoad);    // 关闭等待框
                        list.push(getLayuiSelect('请先选择区/县', '', {}, undefined));
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'homeFilter');
                        return;
                    }
                    // 构造查询条件
                    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;
                                var allTxt = "<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)";
                                list.push(getLayuiSelect(allTxt, '', {StationId: '', dev_id: ''}, undefined));
                                // 遍历查询结果
                                for(var i=0; i<data.length; i++) {
                                    var _data = data[i];
                                    var _attr = {
                                        StationId: _data.StationId,
                                        StationName: _data.StationName,
                                        dev_id: _data.FBSDeviceId
                                    };
                                    var _tmp = getLayuiSelect(_data.StationName, _data.StationId, _attr, _data);
                                    if(pre_home == _data.StationName && isNewLoad){
                                        _tmp = getLayuiSelect(_data.StationName, _data.StationId, _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);
                        }
                    });
                }
                // 表格模块
                var tOptions = {
                    elem: '#pageTbl'
                    ,toolbar: false
                    ,defaultToolbar: []
                    ,cellMinWidth: 80
                    ,cols: [[
                        {type:'checkbox',fixed: 'left'}
                        ,{field:'stationid', title:'机房编号', align:'center', width: 120}
                        ,{field:'stationname', title:'机房名称', align:'center', minWidth: 400}
                        ,{field:'replaced_producer', title:'电池品牌', align:'center', width: 180}
                        ,{field:'replaced_moncapstd', title:'标称容量(AH)', align:'center', width: 160}
                        ,{field:'replaced_monvolstd', title:'标称电压(V)', align:'center', width: 160}
                        ,{field:'replaced_moncount', title:'单体数量', align:'center', width: 120}
                        ,{field:'replaced_reason', title:'更换理由', align:'center', minWidth: 300}
                        ,{field:'replaced_time', title:'更换时间', align:'center', width: 160}
                        ,{field: 'replaced_uname', title: '更换人', align: 'center', width: 160}
                        ,{field:'doThings', fixed: 'right', title:'操作', align: 'center', toolbar: '#doThings', width:120}
                    ]]
                    ,data:[]
                    ,limit: 10000
                    ,page: false
                    ,height: 'full-290'
                };
                // 生成表格数据
                table.render(tOptions);
                // 定义表格工具条点击事件
                table.on('tool(pageTbl)', function(obj) {
                    var event = obj.event;        // 获取事件类型
                    // 根据事件类型触发事件
                    switch(event) {
                        case 'edit':
                            toolEidt(obj);
                        break;
                        case 'del':
                            toolDel(obj);
                        break;
                    }
                });
                // 工具事件-编辑
                function toolEidt(obj) {
                    var data = obj.data;
                    // 存储要编辑的值
                    $('#iframeData').data('edit', data);
                    // 打开修改框
                    layer.open({
                        type: 2
                        ,title: '修改机房更换信息'
                        ,area:['770px', '425px']
                        ,resize: false
                        ,content: 'iframe/ele-change-manage-edit.html'
                    });
                }
                // 工具事件删除
                function toolDel(obj) {
                    var data = obj.data;
                    var temp = [{
                        num: data.num,
                        stationid: data.stationid
                    }];
                    // console.log(temp);
                    // 确认提示框
                    layer.confirm('是否删除当前数据', {icon:2, title: '删除提示'}, function() {
                        var load = layer.load(1);    //开启等待框
                        // 向后台发送删除的请求
                        $.ajax({
                            type: 'post',
                            async: true,
                            url: 'Batt_replaceAction!del',
                            data: 'json='+JSON.stringify(temp),
                            dataType: 'json',
                            success: function(res) {
                                layer.close(load);        // 关闭等待框
                                var rs = JSON.parse(res.result);
                                if(rs.code==1) {
                                    parent.layer.msg('删除成功!');
                                    search();
                                }else {
                                    layer.msg('删除失败!');
                                }
                            },
                            error: function() {
                                layer.msg('请求失败,请检测网络!');
                                layer.close(load);        // 关闭等待框
                            }
                        });
                    });
                }
                // 点击新建按钮
                $('#new_add').click(pageNewAdd);
                // 分页信息-新建
                function pageNewAdd() {
                    // 打开修改框
                    layer.open({
                        type: 2
                        ,title: '添加机房更换信息'
                        ,area:['1200px', '460px']
                        ,fixed: false //不固定
                        ,resize: true
                        ,maxHeight: 660
                        ,maxmin: true
                        ,content: 'iframe/ele-change-manage-add.html'
                    });
                }
                // 查询机房电池更换的信息
                function search() {
                    var load = layer.load(1);
                    var temp = createSearchForm();
                    tOptions.data = [];
                    // console.log(temp);
                    $.ajax({
                        type: 'post',
                        async: true,
                        url: 'Batt_replaceAction!serchByCondition',
                        data: 'json='+JSON.stringify(temp),
                        dataType: 'json',
                        success: function(res) {
                            layer.close(load);    // 关闭等待框
                            var rs = JSON.parse(res.result);
                            if(rs.code == 1) {
                                var data = rs.data;
                                // console.log(data);
                                tOptions.data = data;
                                Page.setAll(data.length);        // 设置值
                            }else {
                                layer.msg('暂无数据!');
                            }
                            Page.setAll(tOptions.data.length);
                            pagePage.setVal();        // 设置分页信息
                            // 生成表格数据
                            table.render(tOptions);
                            $(window).resize();
                        },
                        error: function() {
                            Page.setAll(0);
                            // 生成表格数据
                            table.render(tOptions);
                            $(window).resize();
                            layer.msg('请求失败,请检测网络!');
                        }
                    });
                }
                // 构造查询条件
                function createSearchForm() {
                    var temp = {
                        stationname1: $('#province').val(),
                        stationname2: $('#city').val(),
                        stationname5: $('#county').val(),
                        stationid: $('#home').val(),
                        page: Page.getPage()
                    };
                    return temp;
                }
            });
        </script>
    </body>
</html>
gx_tieta/WebRoot/iframe/ele-change-manage-add.html
New file
@@ -0,0 +1,483 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <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/layui-base.css">
    <style>
        .red {
            font-size: 20px;
            color: #FF5722;
            vertical-align: middle;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <!-- 条件筛选 -->
        <div class="layui-page-filter">
            <div class="page-filter-content">
                <table>
                    <tr class="layui-page-filter-tbl-header layui-page-filter-fweight bg-image">
                        <td>省</td>                        <!-- 省 -->
                        <td>市</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"  lay-search="">
                                            <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>
                    </tr>
                </table>
            </div>
        </div>
        <div style="height: 5px;"></div>
        <div class="layui-form layui-form-pane" lay-filter="eleChange">
            <div class="layui-row layui-col-space5">
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item">
                            <label class="layui-form-label">电池品牌<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_producer" lay-verify="required" autocomplete="off" placeholder="请输入电池品牌" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item layui-form-item160">
                            <label class="layui-form-label">标称容量(AH)<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_moncapstd" lay-verify="required|number" autocomplete="off" placeholder="请输入标称容量" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item">
                            <label class="layui-form-label">单体数量<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <select name="replaced_moncount">
                                     <option value="4">4</option>
                                      <option value="24">24</option>
                                  </select>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item layui-form-item160">
                            <label class="layui-form-label">标称电压(V)<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_monvolstd" lay-verify="required|number" autocomplete="off" placeholder="请输入标称电压" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs12 layui-col-sm12 layui-col-md12 layui-col-lg12">
                    <div class="layui-form-item layui-form-text">
                        <label class="layui-form-label">更换理由<span class="red">*</span></label>
                        <div class="layui-input-block">
                            <textarea placeholder="请输入更换理由" name="replaced_reason" lay-verify="required" class="layui-textarea"></textarea>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
                    <button class="layui-btn layui-btn-sm" lay-submit="" lay-filter="enAdd">确认添加</button>
                    <button class="layui-btn layui-btn-sm layui-btn-primary" onclick="hideParentIframe()">取消</button>
                </div>
            </div>
            <div class="layui-form-item" style="display:none">
                <label class="layui-form-label">机房编号</label>
                <div class="layui-input-block">
                    <input type="text" name="replaced_time" id="replaced_time" lay-verify="title" autocomplete="off" placeholder="机房编号" class="layui-input layui-bg-gray" disabled="">
                </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="../js/base.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" src="../pages/js/common.js"></script>
    <script type="text/javascript">
        layui.use(['form', 'laydate', 'layer'], function() {
            /* 导入模块 */
            var form = layui.form;            // 引入form模块
            var laydate = layui.laydate;    // 引入laydate模块
            var layer = layui.layer;        // 引入layer模块
            /* 获取父页面的值 */
            var editData = parent.$('#iframeData').data('edit');
            var pIndex = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
            // 设置form表单的初始值
            /* form.val('eleChange', {
                'stationid': editData.stationid,            // 机房ID
                'stationname':editData.stationname,            // 机房名称
                'replaced_producer': editData.replaced_producer,    // 电池品牌
                'replaced_moncapstd': editData.replaced_moncapstd,    // 标称容量
                'replaced_monvolstd': editData.replaced_monvolstd,    // 标称电压
                'replaced_reason': editData.replaced_reason,        // 更换理由
                'replaced_moncount': editData.replaced_moncount        // 单体数量
            }); */
            // 投入使用日期渲染
            laydate.render({
                elem: '#replaced_time'
                ,format: 'yyyy-MM-dd HH:mm:ss'
                ,value: new Date()
            });
            // 提交内容
            form.on('submit(enAdd)', function(obj) {
                var stationname = $('#home').val();
                console.log($('#home').data());
                if(!stationname) {
                    layer.msg('请选择需要更换电池的机房!');
                    return false;
                }
                   var data = obj.field;
                   data.stationid = $('#home').find('option:selected').attr('stationid');
                   data.stationname = $('#home').val();
                // 确认提示框
                layer.confirm('是否确认修改',{icon: 3, title: '修改提示'}, function(index) {
                    layer.close(index);
                    // 调用取人修改的方法
                    enAdd(data);
                });
                return false;
            });
            // 确认添加
            function enAdd(data){
                var load = layer.load(1);    //开启等待框
                // 向后台发送添加的请求
                $.ajax({
                    type: 'post',
                    async: true,
                    url: 'Batt_replaceAction!add',
                    data: 'json='+JSON.stringify(data),
                    dataType: 'json',
                    success: function(res) {
                        layer.close(load);        // 关闭等待框
                        var rs = JSON.parse(res.result);
                        if(rs.code==1) {
                            hideParentIframe();
                            parent.layer.msg('添加成功!');
                            parent.$('#paging .search').click();
                        }else {
                            layer.msg('添加失败!');
                        }
                    },
                    error: function() {
                        layer.msg('请求失败,请检测网络!');
                        layer.close(load);        // 关闭等待框
                    }
                });
            }
            // 省-市-区/县-机房-蓄电池组联动
            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;
                            var allTxt = "全部(共"+data.length+"种)";
                            list.push(getLayuiSelect(allTxt, '', {}, 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;
                            var allTxt = "全部(共"+data.length+"种)";
                            list.push(getLayuiSelect(allTxt, '', {}, 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 list = [];                // option结果集
                var ele = $('#county');    // 目标select
                // 判断必要条件是否存在
                var parentStatus = checkLayuiParent($("#city"));
                if(!parentStatus) {
                    layer.close(filterLoad);    // 关闭等待框
                    list.push(getLayuiSelect('请先选择市', '', {}, undefined));
                    // 根据对象数组生成下拉列表
                    createLayuiSelect(ele, list);
                    form.render('select', 'countyFilter');
                    // 查询机房
                    searchHome();
                    return;
                }
                // 构造查询条件
                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;
                            var allTxt = "全部(共"+data.length+"种)";
                            list.push(getLayuiSelect(allTxt, '', {}, 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 list = [];                // option结果集
                var ele = $('#home');    // 目标select
                // 判断必要条件是否存在
                var parentStatus = checkLayuiParent($("#county"));
                if(!parentStatus) {
                    layer.close(filterLoad);    // 关闭等待框
                    list.push(getLayuiSelect('请先选择区/县', '', {}, undefined));
                    // 根据对象数组生成下拉列表
                    createLayuiSelect(ele, list);
                    form.render('select', 'homeFilter');
                    return;
                }
                // 构造查询条件
                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;
                            var allTxt = "全部(共"+data.length+"种)";
                            list.push(getLayuiSelect(allTxt, '', {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.StationName3, _data.StationName, _attr, _data);
                                if(pre_home == _data.StationName && isNewLoad){
                                    _tmp = getLayuiSelect(_data.StationName3, _data.StationName, _attr, _data,true);
                                    auto_seach = true;
                                }
                                list.push(_tmp);
                            }
                        }else {
                            list.push(getLayuiSelect('暂无机房', '', {}, undefined));
                        }
                        layer.close(filterLoad);
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'homeFilter');
                    }
                });
            }
        });
    </script>
</body>
</html>
gx_tieta/WebRoot/iframe/ele-change-manage-edit.html
New file
@@ -0,0 +1,189 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <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/layui-base.css">
    <style>
        .red {
            font-size: 20px;
            color: #FF5722;
            vertical-align: middle;
        }
    </style>
</head>
<body>
    <div class="layui-container">
        <div style="height: 10px;"></div>
        <div class="layui-form layui-form-pane" lay-filter="eleChange">
            <div class="layui-row layui-col-space5">
                <div class="layui-col-xs12 layui-col-sm12 layui-col-md12 layui-col-lg12">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item">
                            <label class="layui-form-label">机房名称</label>
                            <div class="layui-input-block">
                                <input type="text" name="stationname" lay-verify="title" autocomplete="off" placeholder="机房名称" class="layui-input layui-bg-gray" disabled="">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item">
                            <label class="layui-form-label">电池品牌<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_producer" lay-verify="required" autocomplete="off" placeholder="请输入电池品牌" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item layui-form-item160">
                            <label class="layui-form-label">标称容量(AH)<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_moncapstd" lay-verify="required|number" autocomplete="off" placeholder="请输入标称容量" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item">
                            <label class="layui-form-label">单体数量<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <select name="replaced_moncount">
                                     <option value="4">4</option>
                                      <option value="24">24</option>
                                  </select>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 layui-col-lg6">
                    <div class="layui-form layui-form-pane">
                        <div class="layui-form-item layui-form-item160">
                            <label class="layui-form-label">标称电压(V)<span class="red">*</span></label>
                            <div class="layui-input-block">
                                <input type="text" name="replaced_monvolstd" lay-verify="required|number" autocomplete="off" placeholder="请输入标称电压" class="layui-input">
                            </div>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs12 layui-col-sm12 layui-col-md12 layui-col-lg12">
                    <div class="layui-form-item layui-form-text">
                        <label class="layui-form-label">更换理由<span class="red">*</span></label>
                        <div class="layui-input-block">
                            <textarea placeholder="请输入更换理由" name="replaced_reason" lay-verify="required" class="layui-textarea"></textarea>
                        </div>
                    </div>
                </div>
                <div class="layui-col-xs6 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
                    <button class="layui-btn layui-btn-sm" lay-submit="" lay-filter="enEdit">确认修改</button>
                    <button class="layui-btn layui-btn-sm layui-btn-primary" onclick="hideParentIframe()">取消</button>
                </div>
            </div>
            <div class="layui-form-item" style="display:none">
                <label class="layui-form-label">机房编号</label>
                <div class="layui-input-block">
                    <input type="text" name="stationid" lay-verify="title" autocomplete="off" placeholder="机房编号" class="layui-input layui-bg-gray" disabled="">
                </div>
            </div>
            <div class="layui-form-item" style="display:none">
                <label class="layui-form-label">机房编号</label>
                <div class="layui-input-block">
                    <input type="text" name="num" lay-verify="title" autocomplete="off" placeholder="机房编号" class="layui-input layui-bg-gray" disabled="">
                </div>
            </div>
            <div class="layui-form-item" style="display:none">
                <label class="layui-form-label">机房编号</label>
                <div class="layui-input-block">
                    <input type="text" name="replaced_time" id="replaced_time" lay-verify="title" autocomplete="off" placeholder="机房编号" class="layui-input layui-bg-gray" disabled="">
                </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="../js/base.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" src="../pages/js/common.js"></script>
    <script type="text/javascript">
        layui.use(['form', 'laydate', 'layer'], function() {
            /* 导入模块 */
            var form = layui.form;            // 引入form模块
            var laydate = layui.laydate;    // 引入laydate模块
            var layer = layui.layer;        // 引入layer模块
            /* 获取父页面的值 */
            var editData = parent.$('#iframeData').data('edit');
            var pIndex = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
            // 设置form表单的初始值
            form.val('eleChange', {
                'num': editData.num,                        // 主键
                'stationid': editData.stationid,            // 机房ID
                'stationname':editData.stationname,            // 机房名称
                'replaced_producer': editData.replaced_producer,    // 电池品牌
                'replaced_moncapstd': editData.replaced_moncapstd,    // 标称容量
                'replaced_monvolstd': editData.replaced_monvolstd,    // 标称电压
                'replaced_reason': editData.replaced_reason,        // 更换理由
                'replaced_moncount': editData.replaced_moncount        // 单体数量
            });
            // 投入使用日期渲染
            laydate.render({
                elem: '#replaced_time'
                ,format: 'yyyy-MM-dd HH:mm:ss'
                ,value: new Date()
            });
            // 提交内容
            form.on('submit(enEdit)', function(obj) {
                   var data = obj.field;
                // 确认提示框
                layer.confirm('是否确认修改',{icon: 3, title: '修改提示'}, function(index) {
                    layer.close(index);
                    // 调用取人修改的方法
                    enEdit(data);
                });
                return false;
            });
            // 确认修改
            function enEdit(data){
                var load = layer.load(1);    //开启等待框
                // 向后台发送修改的请求
                $.ajax({
                    type: 'post',
                    async: true,
                    url: 'Batt_replaceAction!update',
                    data: 'json='+JSON.stringify(data),
                    dataType: 'json',
                    success: function(res) {
                        layer.close(load);        // 关闭等待框
                        var rs = JSON.parse(res.result);
                        if(rs.code==1) {
                            hideParentIframe();
                            parent.layer.msg('修改成功!');
                            parent.$('#paging .search').click();
                        }else {
                            layer.msg('修改失败!');
                        }
                    },
                    error: function() {
                        layer.msg('请求失败,请检测网络!');
                        layer.close(load);        // 关闭等待框
                    }
                });
            }
        });
    </script>
</body>
</html>
gx_tieta/WebRoot/mobil/voltageMbargraph.html
@@ -46,6 +46,10 @@
        height:1px;
        clear:both;
    }
    .ui-grid-c>.ui-block-a, .ui-grid-c>.ui-block-b, .ui-grid-c>.ui-block-c, .ui-grid-c>.ui-block-d {
    width: 25%;
    font-size: 0.8em;
    }
</style>
    
</head>
gx_tieta/WebRoot/pages/css/layui-base.css
New file
@@ -0,0 +1,64 @@
@charset "UTF-8";
/* form */
.layui-form-pane .layui-form-item160 .layui-form-label {
    width: 160px;
}
.layui-form-pane .layui-form-item160 .layui-input-block {
    margin-left: 160px;
}
/* layui-page-filter */
.page-filter-header {
    line-height: 32px;
    background: url('../images/table_th_bg.gif') repeat-x;
    text-align:center;
}
.layui-page-filter-fweight {
    font-weight: bold;
    text-align: center;
}
.page-filter-content table{
    width: 100%;
}
.page-filter-content table td {
    border: 1px solid #ccc;
}
.layui-page-filter-tbl-header td {
    font-size: 14px;
    padding: 6px 0;
}
.page-filter-content .layui-input,
.page-filter-content .layui-select {
    border: 0;
}
.page-filter-content .layui-input {
    height: 34px;
    font-size: 14px;
}
.page-filter-content .layui-form-item {
    margin: 0;
}
.page-filter-content .layui-input-block {
    height: 34px;
    min-height: 34px;
    margin: 0;
}
.page-filter-content .layui-form-select dl {
    top: 36px;
}
.page-filter-content .bg-image td {
    background:url('../images/table_th_bg.gif') repeat-x;
}
.layui-table thead tr {
    color: #000;
    font-weight: bold;
    background:url('../images/table_th_bg.gif') repeat-x;
}
.layui-table-view .layui-table th {
    font-weight: bold;
    padding: 2px 0;
}
.layui-table td, .layui-table th {
    border-color: #ccc;
}
gx_tieta/WebRoot/pages/js/mylayui.js
@@ -29,6 +29,12 @@
    }
}
// 关闭iframe弹出层
function hideParentIframe() {
    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
    parent.layer.close(index); //再执行关闭
}
// 检测下拉框的必要条件是否存在
function checkLayuiParent(parent) {
    var status = false;
gx_tieta/src/com/fgkj/dao/impl/Batt_replaceImpl.java
@@ -32,9 +32,9 @@
    @Override
    public boolean update(Object obj) {
        Batt_replace re=(Batt_replace) obj;
        String sql=" update web_site.tb_batt_replace set replaced_producer=?,replaced_moncapstd=?,replaced_monvolstd=?,replaced_moncount=?,replaced_uid=?,replaced_time=?,replaced_reason=? where stationid=? ";
        String sql=" update web_site.tb_batt_replace set replaced_producer=?,replaced_moncapstd=?,replaced_monvolstd=?,replaced_moncount=?,replaced_uid=?,replaced_time=?,replaced_reason=? where stationid=? and num=? ";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[] {re.getReplaced_producer(),re.getReplaced_moncapstd(),re.getReplaced_monvolstd(),re.getReplaced_moncount()
                ,re.getReplaced_uid(),re.getReplaced_time(),re.getReplaced_reason(),re.getStationid()});
                ,re.getReplaced_uid(),re.getReplaced_time(),re.getReplaced_reason(),re.getStationid(),re.getNum()});
        return bl;
    }
    //删除机房电池更改记录(多条)
@@ -46,7 +46,7 @@
        if(list!=null&&list.size()>0) {
            for (int i = 0; i < list.size(); i++) {
                Batt_replace re=list.get(i);
                String sql=" delete from  web_site.tb_batt_replace where stationid="+re.getStationid();
                String sql=" delete from  web_site.tb_batt_replace where stationid="+re.getStationid()+" and num="+re.getNum();
                sql_str.add(sql);
                {
                    String msg="删除"+re.getStationid()+"机房的电池更改记录";
@@ -72,7 +72,7 @@
        Page p=breplace.getPage();
        String numberSql=" SELECT FOUND_ROWS() number";
        Connection conn=DBUtil.getConn();
        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_batt_replace.stationid,replaced_producer,replaced_moncapstd,replaced_monvolstd"
        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_batt_replace.num, tb_batt_replace.stationid,replaced_producer,replaced_moncapstd,replaced_monvolstd"
                + ",replaced_moncount,replaced_uid,replaced_time,replaced_reason"
                + ",db_battinf.tb_battinf.stationname "
                + " from db_battinf.tb_battinf,web_site.tb_batt_replace "
@@ -90,6 +90,7 @@
                try {
                    while(rs.next()) {
                        Batt_replace re=new Batt_replace();
                        re.setNum(rs.getInt("num"));
                        re.setStationid(rs.getString("stationid"));
                        re.setStationname(rs.getString("stationname"));
                        re.setReplaced_producer(rs.getString("replaced_producer"));