hdw
2018-11-02 5254ca4206fee8db39de086ab836c6ea39b1ad14
问题反馈修改
3个文件已修改
141 ■■■■■ 已修改文件
gx_tieta/WebRoot/batt-fault-manage.jsp 130 ●●●●● 补丁 | 查看 | 原始文档 | 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,13 +137,6 @@
            
            // 生成表格数据
            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=[];
@@ -163,17 +150,15 @@
                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'
                });
                
            }        
@@ -237,16 +222,61 @@
                    $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();
    });
@@ -254,7 +284,8 @@
    function findStationNamebyStationname1() {
        var tmp = {
            StationName1: $("#station_name1").val(),
            StationName2: $("#city").val()
                    StationName2: $("#city").val(),
                    StationName5: $("#county").val()
        };
        //var selectvalue=$("#station_name1 option:selected").val();
        //alert(selectvalue);
@@ -286,6 +317,7 @@
        });
    }    
    
            // 构造查询后台数据
    function tempCondition(){
        temp ={
            StationId:"",
@@ -296,15 +328,17 @@
                    pageSize:10,
                    pageCurr:1,
                },    
        }
                };
        console.info(temp);
        return temp; 
    }
    
            //  查询故障内容
    function searchfault()
    {
        var sData = tempCondition(); 
        var loading = layer.load();
                var load = layer.load(1);
                tOptions.data = [];
        // 根据查询条件,查询内容
        $.ajax({
            type: 'post',
@@ -313,34 +347,30 @@
            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++){
                            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;
                                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);
                        //console.info(tOptions);
                var pageNum = tOptions.data.length;
                console.info(pageNum);
                        //console.info(pageNum);
                tOptions.limit = pageNum;
                // 设置分页信息
                $('#total').text(pageNum);
                table.render(tOptions);
                layer.close(loading);
                        layer.close(load);
            } 
        });
    }
@@ -348,11 +378,7 @@
    $('#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_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;
    }