hdw
2018-11-02 5254ca4206fee8db39de086ab836c6ea39b1ad14
问题反馈修改
3个文件已修改
451 ■■■■ 已修改文件
gx_tieta/WebRoot/batt-fault-manage.jsp 440 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -44,25 +44,21 @@
                    <tr>
                        <th>省</th>                                                        <!-- 省 -->
                        <th>市</th>                                                        <!-- 市 -->
                        <th>区/县</th>                                                    <!-- 市 -->
                        <th><s:text name="Computer_site"/></th>                                                            <!-- 机房站点 -->
                    </tr>
                    <tr>
                        <td>
                            <select name="" id="station_name1">
                            </select>
                            <select name="" id="station_name1"></select>
                        </td>
                        <td>
                            <select name="" id="city">
                            </select>
                            <select name="" id="city"></select>
                        </td>
                        <td>
                            <select name="" id="station_name3">
                            </select>
                            <select name="" id="county"></select>
                        </td>
                        <td>
                            <select name="" id="station_name3"></select>
                        </td>
                        
                        
@@ -87,12 +83,7 @@
        <div id="paging">
            <a href="javascript:" id="search" class="layui-btn layui-btn-normal search">查找</a>
            <a class="layui-btn layui-btn-normal addbtn">添加</a>
    <script type="text/html" id="toolBar">
        <a class="layui-btn layui-btn-xs" lay-event="details">添加</a>
    </script>
            <a href="javascript:" id="export_table"  class="layui-btn layui-btn-normal outbtn"><s:text name="Export"/></a>        <!-- 导出 -->
        </div>
    </div>
    <div id="details"></div>
@@ -107,7 +98,9 @@
    <script type="text/javascript" src="js/myinterval.js"></script>
    <script type="text/javascript" src="js/pageUtil.js"></script>
    <script type="text/javascript" src="src/layui.js"></script>
    <script type="text/html" id="toolBar">
        <a class="layui-btn layui-btn-xs" lay-event="details">故障详情</a>
    </script>
    <script type="text/javascript">
        var permits;
        <%    Object obj=session.getAttribute("permits");
@@ -134,7 +127,8 @@
                ,{field:'city', title:'市', align:'center'}
                ,{field:'stationName3', title:'机房名称', align:'center'}
                ,{field:'note', title:'时间', align:'center'}
                ,{field:'question',fixed: 'right', title:'故障详情',  width: 70}
                ,{field:'question', title:'故障描述', align:'center'},
                ,{fixed: 'right', title:'故障详情',toolbar: '#toolBar', width: 100}
                ]]
                ,data:[]
                ,page: true
@@ -143,216 +137,248 @@
            
            // 生成表格数据
            table.render(tOptions);
            // $(document).ready(function(){
                //console.info(1111);
           //     tOptions.data=getData(100,0);
          //      var tableObj = table.render(tOptions);
          //      tableObj.reload(tOptions);
          //  });
            
            function getData(a,b){
            var arr=[];
            for(i=0;i<a;i++){
                arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});
            }
                   return arr
                var arr=[];
                for(i=0;i<a;i++){
                    arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});
                }
                   return arr
            }
        
            $(document).on('click','.addbtn',function(){
                searchStationHistRecord();
            });
            function searchStationHistRecord(){
                // 将param添加到#detailsOpts
                //$('#detailsOpts').data('data', param);
                // 请求获取当前省下的市
                // 显示面板
                layer.open({
                    type: 2,
                    title: '<span style="font-weight:bold">>>问题添加</span>',
                    area: ['650px', '450px'],
                    area: ['1200px', '600px'],
                    fixed: false, //不固定
                    resize: false,
                    maxmin: true,
                    content: 'iframe/batt-fault-manage-add.html'
                    content: 'iframe/batt-fault-manage-add1.html'
                });
                
            }        
        // 省-市-机房-电池组
        $(document).ready(function() {
            //页面加载时查询维护区中的枢纽类型
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
            function(data) {
                data = data.result;
                data = eval("(" + data + ")");
                //console.info(data);
                if (data.code == 1 && data.data.length > 0) {
                    var $select = $("#station_name1");
                    $select.text('');
                    for (var i = 0; i <= data.data.length; i++) {
                        $option = $("<option></option>");
                        if (i == 0) {
                            $option.html("全部(" + data.data.length + ")");
                            $option.attr("value", "");
                        } else {
                            $option.text(data.data[i - 1]);
                            $option.attr("value", data.data[i - 1]);
                        }
                        $select.append($option);
                    }
                } else {
                    $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
                }
                findCity();
            });
     });
            // 省-市-机房-电池组
            $(document).ready(function() {
                //页面加载时查询维护区中的枢纽类型
                $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
                function(data) {
                    data = data.result;
                    data = eval("(" + data + ")");
                    //console.info(data);
                    if (data.code == 1 && data.data.length > 0) {
                        var $select = $("#station_name1");
                        $select.text('');
                        for (var i = 0; i <= data.data.length; i++) {
                            $option = $("<option></option>");
                            if (i == 0) {
                                $option.html("全部(" + data.data.length + ")");
                                $option.attr("value", "");
                            } else {
                                $option.text(data.data[i - 1]);
                                $option.attr("value", data.data[i - 1]);
                            }
                            $select.append($option);
                        }
                    } else {
                        $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
                    }
                    findCity();
                });
             });
    function findCity() {
        var data = {
            StationName1: $("#station_name1").val()
        };
        // 请求获取当前省下的市
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName2",
            async: true,
            dataType: 'json',
            data: "json = " + JSON.stringify(data),
            success: function(data) {
                var rs = JSON.parse(data.result);
                var $select = $("#city");
                if (rs.code == 1) {
                    var _data = rs.data;
                    // 根据数据构造生成下拉列表的数据
                    var optsList = [];
                    for (var i = 0; i < _data.length; i++) {
                        var __data = _data[i];
                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                        optsList.push(tmp);
                    }
                    // 根据数据生成下拉列表
                    createOptions($select, optsList, true);
                } else {
                    $select.text('').html('<option>暂无可测市</option>');
                }
                findStationNamebyStationname1();
            }
        });
    }
    //当维护区的值变换时更新市
    $('#station_name1').change(function() {
        findCity();
    });
    //当维护区的值变换时更新机房站点
    $('#city').change(function() {
        findStationNamebyStationname1();
    });
    //根据省,市查询站点
    function findStationNamebyStationname1() {
        var tmp = {
            StationName1: $("#station_name1").val(),
            StationName2: $("#city").val()
        };
        //var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
        $.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
        function(data) {
            var rs = JSON.parse(data.result);
            console.info(rs);
            if (rs.code == 1) {
                var _data = rs.data;
                var $select = $("#station_name3");
                // 根据数据构造生成下拉列表的数据
                var optsList = [];
                for (var i = 0; i < _data.length; i++) {
                    var __data = _data[i];
                    var _attr = {
                        StationId: __data.StationId
                    };
                    var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
                    optsList.push(tmp);
                }
                // 根据数据生成下拉列表
                createOptions($select, optsList, true);
            } else {
                $("#station_name3").text('').html('<option>暂无可测机房站点</option>');
            }
        });
    }
    function tempCondition(){
        temp ={
            StationId:"",
            StationName1:$('#station_name1').val(),
            StationName2:$('#city').val(),
            StationName5:"",
            page:{
                    pageSize:10,
                    pageCurr:1,
                },
        }
        console.info(temp);
        return temp;
    }
    function searchfault()
    {
        var sData = tempCondition();
        var loading = layer.load();
        // 根据查询条件,查询内容
        $.ajax({
            type: 'post',
            async: true,
            url: 'Deverror_recordAction!serchByCondition',
            data: "json="+JSON.stringify(sData),
            dataType: 'json',
            success: function(result) {
                //console.info(result);
                var data = JSON.parse(result.result);
                console.info(data)
                if(data.code==1&&data.data.length>0){
                    console.info(data);
                    var data = data.data;
                    for(i=0;i<data.length;i++){
                        var tmp = {};
                        var data = data[i];
                        tmp.station_name1 = data.stationName1;
                        tmp.city = data.stationName2;
                        tmp.stationName3 = data.stationName;
                        tmp.note = data.record_time;
                        tmp.question = data.error_descript;
                        tOptions.data.push(tmp);
                    }
                    //tOptions.data.length = data.length;
                }else {
                    layer.msg('暂无数据!', {icon:0, shade: 0.1,shadeClose:true});
                }
                console.info(tOptions);
                var pageNum = tOptions.data.length;
                console.info(pageNum);
                tOptions.limit = pageNum;
                // 设置分页信息
                $('#total').text(pageNum);
                table.render(tOptions);
                layer.close(loading);
            }
        });
    }
    $('#search').click(function(){
        searchfault();
    });
});
            function findCity() {
                var data = {
                    StationName1: $("#station_name1").val()
                };
                // 请求获取当前省下的市
                $.ajax({
                    type: "post",
                    url: "BattInfAction!serchStationName2",
                    async: true,
                    dataType: 'json',
                    data: "json = " + JSON.stringify(data),
                    success: function(data) {
                        var rs = JSON.parse(data.result);
                        var $select = $("#city");
                        if (rs.code == 1) {
                            var _data = rs.data;
                            // 根据数据构造生成下拉列表的数据
                            var optsList = [];
                            for (var i = 0; i < _data.length; i++) {
                                var __data = _data[i];
                                var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
                                optsList.push(tmp);
                            }
                            // 根据数据生成下拉列表
                            createOptions($select, optsList, true);
                        } else {
                            $select.text('').html('<option>暂无可测市</option>');
                        }
                        findCounty();
                    }
                });
            }
            // 查询区/县
            function findCounty() {
                var tmp = {
                    StationName1:$("#station_name1").val(),
                    StationName2:$("#city").val(),
                };
                // 查询区县
                $.ajax({
                    type: 'post',
                    async: true,
                    url: "BattInfAction!serchStationName5",
                    data: "json="+JSON.stringify(tmp),
                    success:function(data) {
                        var rs = JSON.parse(data.result);
                        var $select = $("#county");
                        if(rs.code==1){
                            var _data = rs.data;
                            // 根据数据构造生成下拉列表的数据
                            var optsList = [];
                            for(var i=0;i<_data.length;i++){
                                var __data = _data[i];
                                var _attr = {
                                    StationId: __data.StationId
                                };
                                var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
                                optsList.push(tmp);
                            }
                            // 根据数据生成下拉列表
                            createOptions($select, optsList, true);
                        }else{
                            $select.text('').html('<option>暂无可测机房站点</option>');
                        }
                        findStationNamebyStationname1();
                    }
                });
            }
            //当维护区的值变换时更新市
            $('#station_name1').change(function() {
                findCity();
            });
            //当维护区的值变换时更新机房站点
            $('#city').change(function() {
                findCounty();
            });
            //当区/县的值变换时更新机房站点
            $('#county').change(function(){
                findStationNamebyStationname1();
            });
    
            //根据省,市查询站点
            function findStationNamebyStationname1() {
                var tmp = {
                    StationName1: $("#station_name1").val(),
                    StationName2: $("#city").val(),
                    StationName5: $("#county").val()
                };
                //var selectvalue=$("#station_name1 option:selected").val();
                //alert(selectvalue);
                $.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
                function(data) {
                    var rs = JSON.parse(data.result);
                    console.info(rs);
                    if (rs.code == 1) {
                        var _data = rs.data;
                        var $select = $("#station_name3");
                        // 根据数据构造生成下拉列表的数据
                        var optsList = [];
                        for (var i = 0; i < _data.length; i++) {
                            var __data = _data[i];
                            var _attr = {
                                StationId: __data.StationId
                            };
                            var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
                            optsList.push(tmp);
                        }
        
                        // 根据数据生成下拉列表
                        createOptions($select, optsList, true);
                    } else {
                        $("#station_name3").text('').html('<option>暂无可测机房站点</option>');
                    }
                });
            }
            // 构造查询后台数据
            function tempCondition(){
                temp ={
                    StationId:"",
                    StationName1:$('#station_name1').val(),
                    StationName2:$('#city').val(),
                    StationName5:"",
                    page:{
                            pageSize:10,
                            pageCurr:1,
                        },
                };
                console.info(temp);
                return temp;
            }
            //  查询故障内容
            function searchfault()
            {
                var sData = tempCondition();
                var load = layer.load(1);
                tOptions.data = [];
                // 根据查询条件,查询内容
                $.ajax({
                    type: 'post',
                    async: true,
                    url: 'Deverror_recordAction!serchByCondition',
                    data: "json="+JSON.stringify(sData),
                    dataType: 'json',
                    success: function(result) {
                        var data = JSON.parse(result.result);
                        if(data.code==1&&data.data.length>0){
                            data = data.data;
                            for(var i=0;i<data.length;i++){
                                var tmp = {};
                                var _data = data[i];
                                tmp.station_name1 = _data.stationName1;
                                tmp.city = _data.stationName2;
                                tmp.stationName3 = _data.stationName;
                                tmp.note = _data.record_time;
                                tmp.question = _data.error_descript;
                                tOptions.data.push(tmp);
                            }
                        }else {
                            layer.msg('暂无数据!', {icon:0, shade: 0.1,shadeClose:true});
                        }
                        //console.info(tOptions);
                        var pageNum = tOptions.data.length;
                        //console.info(pageNum);
                        tOptions.limit = pageNum;
                        // 设置分页信息
                        $('#total').text(pageNum);
                        table.render(tOptions);
                        layer.close(load);
                    }
                });
            }
            $('#search').click(function(){
                searchfault();
            });
        });
    </script>
  </body>
</html>
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -46,7 +46,7 @@
                }
            }
        }
        dev_record.setPicture_num(file.size());
        //dev_record.setPicture_num(file.size());
        //System.out.println(dev_record);
        ServiceModel model=service.add(dev_record);
        result=tojson(model);
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -37,23 +37,24 @@
        if(dev_record.getPicture_num()>=1){
            sql+=",picture_one";
            endsql+=",? ";
            list.add(dev_record.getPicture_one());
        }
        if(dev_record.getPicture_num()>=2){
            sql+=",picture_two";
            endsql+=",? ";
            list.add(dev_record.getPicture_two());
        }if(dev_record.getPicture_num()>=3){
            sql+=",picture_three";
            endsql+=",? ";
            list.add(dev_record.getPicture_three());
        }if(dev_record.getPicture_num()>=4){
            sql+=",picture_four";
            endsql+=",? ";
            list.add(dev_record.getPicture_four());
        }
        list.add(dev_record.getPicture_one());
        list.add(dev_record.getPicture_two());
        list.add(dev_record.getPicture_three());
        list.add(dev_record.getPicture_four());
        endsql+=")";
        sql+=endsql;
        //System.err.println(sql);
        boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);
        return bl;
    }