Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-12-24 0c652f652fedd626383d7d3d151f23fee24a7680

Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/Top.jsp

@@ -131,8 +131,8 @@
                    <img src="image/webStatus/control_normal.gif" alt="线程监控程序" title="线程监控程序运行：正常">

                </div>

                <div class="cell-list voice">

                    <i class="fa fa-bell"></i>

                    <i class="fa fa-bell-slash"></i>

                    <i class="fa fa-bell" title="关闭语音播报"></i>

                    <i class="fa fa-bell-slash" title="开启语音播报"></i>

                </div>

                <div class="cell-list server-time" style="white-space: nowrap">                    

                    2018-11-26 00:00:00

@@ -924,13 +924,13 @@
                async: true,

                success: function(rs) {

                    linkNum = 0;    // 初始化测试连接

                    setTimeout(checkServer, 200);

                    setTimeout(checkServer, 500);

                },

                error:function() {

                     // 网络连接不正常

                    if(!navigator.onLine) {

                         linkNum = 0;

                         setTimeout(checkServer, 200);

                         setTimeout(checkServer, 500);

                    }else{

                         linkNum++;

                         // 服务器连接不正常


 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Deverror_recordImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Deverror_recordImpl$2.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Deverror_recordImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Deverror_record.class

Binary files differ

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -63,6 +63,7 @@
                        </td>

                        <td>

                            <select name="" id="question_name">

                                <option value="-1">全部</option>

                                <option value="0">电池问题</option>

                                <option value="1">电源问题</option>

                                <option value="2">空调问题</option>

@@ -126,9 +127,9 @@
    <script type="text/javascript" src="js/rightmenu.js"></script>

    <script type="text/javascript" src="js/myConfirm.js"></script>    

    <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/javascript" src="js/pageUtil.js"></script>

    <script type="text/javascript" src="pages/js/common.js"></script>

    <script type="text/html" id="toolBar">

        <a class="layui-btn layui-btn-xs" lay-event="details">故障详情</a>

        <a class="layui-btn layui-btn-xs" lay-event="delError">排除故障方案</a>

@@ -156,6 +157,9 @@
                ,element = layui.element

                ,$=layui.jquery

                ,form = layui.form;

				
            var homeQuestion = GLOBAL.HomeQues;            // 机房问题列表

            $('#question_name').html(homeQuestion.getOptions(true));

            var uploadIframe;        // 面板

            // 表格数据配置项

            var tOptions = {

@@ -164,6 +168,7 @@
                ,cellMinWidth: 80

                ,cols: [[

                 {field:'stationName3', title:'机房名称', align:'center',width:450}

                ,{field:'ques_type', title:'故障类型', align:'center',width:150}

                ,{field:'note', title:'故障提出日期', align:'center',width:150}

                ,{field:'originator', title:'故障提出人', align:'center',width:150}

                ,{field:'error_en', title: '故障排除状态', align: 'center',width:150}

@@ -517,11 +522,14 @@
            

            // 构造查询后台数据

            function tempCondition(){

                var sid = $('#station_name3').find('option:selected').attr('stationid');

                sid = sid?sid: "";

                temp ={

                    StationId:"",

                    StationId: sid,

                    StationName1:$('#station_name1').val(),

                    StationName2:$('#city').val(),

                    StationName5:"",

                    StationName5:$('#county').val(),

                    MonCount: $('#question_name').val(),

                    page:Page,    

                };

                return temp; 

@@ -564,6 +572,7 @@
                                tmp.originator = _data.uname;

                                tmp.solve_user = _data.solve_uname;

                                tmp.solve_record_time = solve_record_time;

                                tmp.ques_type = homeQuestion.getLayuiBtn(_data.error_state);

                                tOptions.data.push(tmp);

                                Page.pageAll = _data.page.pageAll;

                            }

@@ -626,6 +635,11 @@
                    $('#number').val(Page.pageSize);

                }

            });

		    
            // 切换问题类型重新设置分页信息

            $('#question_name').change(function() {

                Page.pageCurr = 1;

            });

        });    

    </script>

  </body>


 gx_tieta/WebRoot/control.jsp

@@ -5324,7 +5324,7 @@
        //查询设备的SD卡状态

        function searchDevSDState(){

            var obj= getBatt();    

            console.info(obj);	
            var status = GLOBAL.circleStatus.status;	
            $.ajax({

                type: "post",

                url: "Bts_station_stateAction_action_serchSDCard",

@@ -5333,8 +5333,10 @@
                data: "json = " + JSON.stringify(obj),

                success: function(result) {

                    var rs = JSON.parse(result.result);

                    console.info(rs);

	                
                    //console.info(rs);

                    var sdStatus = rs.data?'已插入': '<span style="color: #FF0000">未插入</span>';

                    //console.log(sdStatus);

                    status.setText('sdCard', "sd卡状态："+sdStatus);

                    clearTimeout(searchDevSDState.timeout);

                    searchDevSDState.timeout = setTimeout(function() {
                        searchDevSDState();

 gx_tieta/WebRoot/css/web-status-outline.css

@@ -14,6 +14,7 @@
.web-status .cell-list.voice {

    font-size: 18px;

    color: #1995DA;

    cursor: pointer;

}

.web-status .cell-list.voice .fa-bell-slash {

    display: none;


 gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html

@@ -29,6 +29,7 @@
                        <td>市</td>                        <!-- 市 -->

                        <td>区/县</td>                    <!-- 区/县 -->

                        <td>机房名称</td>                    <!-- 机房名称 -->

                        <td>问题类型</td>                    <!-- 问题类型 -->

                    </tr>

                    <tr>

                        <td>

@@ -71,6 +72,15 @@
                                        <select name="home" id="home" lay-filter="home">

                                            <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="ques_type" id="ques_type" lay-filter="ques_type"></select>

                                    </div>

                                </div>

                            </div>

@@ -119,14 +129,20 @@
     </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','table', 'upload', 'layer'], function() {

            var form = layui.form;

            var upload = layui.upload;

            var layer = layui.layer;

            

    		
            var homeQuestion = GLOBAL.HomeQues;            // 机房问题列表

            $('#ques_type').html(homeQuestion.getOptions());

            form.render('select', 'ques_type');

            

            // 图片上传

            var imgsInfo = $('#imgsInfo');

@@ -198,7 +214,6 @@
                // 更新内容

                createUploadData();

                var formData = new FormData();

    			
                var files = addImgsOpts.files;

                var filesArr = [];

                Object.keys(files).forEach(function(key) {

@@ -266,11 +281,12 @@
            function createUploadData() {

                var home = $('#home').find('option:selected');

                var stationid = home.attr('stationid')?home.attr('stationid'):0;

    			
                var error_state = $('#ques_type').val();

                var json = addImgsOpts.json;

                json.record_time = date.format('yyyy-MM-dd hh:mm:ss');    // 提交日期

                json.error_descript = $('#desc').val();                    // 问题描述

                json.stationId = stationid;

                json.error_state = error_state;

            }

            

            // 查询省下拉框


 gx_tieta/WebRoot/js/elecircle.content.js

@@ -1036,6 +1036,15 @@
            }

        },

        {

            name: 'sdCard',

            type: 'text',

            status: 0,

            notShow: false,

            content: {

                text: 'sd卡状态：？？？'

            }

        },

        {

            name: 'signal',

            type: 'text',

            status: 0,


 gx_tieta/WebRoot/pages/js/common.js

@@ -472,6 +472,43 @@
    gl.CMD.batt.set = 0x37;        // 设置电池参数

})(jQuery, window, document, GLOBAL);



// 问题类型

;(function($, window, document, gl, undefined) {

    // HomeQues的命名空间

    gl.namespace('HomeQues');

    var lists = ['电池问题', '电源问题', '空调问题', '漏水问题', 'BTS设备问题', 'GPRS模块问题', '施工安装问题', '铁锂电池问题', '其他问题'];

	
    // 将questions绑定到HomeQues下

    gl.HomeQues.lists = lists;

	
    // 获取option列表

    function getOptions(bool) {

        var options = '';

        // 是否添加全部选项

        if(bool) {

            options += '<option value="-1">全部</option>';

        }

        // 遍历lists返回所有的option

        for(var i=0; i<lists.length; i++) {

            options += '<option value="'+i+'">'+lists[i]+'</option>';

        }

        return options;

    }

	
    // 将getOptions绑定到HomeQues下

    gl.HomeQues.getOptions = getOptions;

	
    // 获取故障类型layuiBtn

    function getLayuiBtn(num) {

        var txt = lists[num];

        return '<a href="javascript:;" class="layui-btn layui-btn-xs">'+txt+'</a>';

    }

	
    // 将getLayuiBtn绑定到HomeQues下

    gl.HomeQues.getLayuiBtn = getLayuiBtn;

	
})(jQuery, window, document, GLOBAL);



// 地图信息

;(function($, window, document, gl, undefined) {

    // 定义BMap的命名空间


 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java

@@ -26,8 +26,8 @@
   //用户手动添加问题

    public boolean add(Object obj) {

        Deverror_record dev_record=(Deverror_record) obj;

        String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num ";

        String endsql=") values(?,?,?,?,?,?,?";

        String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num,error_state ";

        String endsql=") values(?,?,?,?,?,?,?,?";

        List list=new ArrayList();

        list.add(dev_record.getStationId());

        list.add(dev_record.getRecord_time());

@@ -36,6 +36,7 @@
        list.add(dev_record.getUid());

        list.add(dev_record.getUname());

        list.add(dev_record.getPicture_num());

        list.add(dev_record.getError_state());

        if(dev_record.getPicture_num()>=1){

            sql+=",picture_one";

            endsql+=",? ";

@@ -110,11 +111,19 @@
        Page p=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql=" SELECT FOUND_ROWS() number";

        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num,solve_uid,solve_picture_num,uid,uname,solve_uname,solve_record_time  " +

        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num,error_state,solve_uid,solve_picture_num,uid,uname,solve_uname,solve_record_time  " +

                "  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +

                "  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +

                " where tb_deverror_record.stationid=tb_battinf.stationid " +

                " and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ?  " ;

        //问题类型

        String errSqlT=" and error_state!=?";

        String errSqlF=" and error_state=?";

        if(binf.getMonCount()==-1) {

            sql+=errSqlT;

        }else {

            sql+=errSqlF;

        }

        //用户管理

        String userSql=" and db_battinf.tb_battinf.StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=? "+

@@ -126,7 +135,7 @@
        String limitSql=" limit ?,? ";

        sql+=limitSql;

        List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"

                ,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {

                ,binf.getMonCount(),binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -145,6 +154,7 @@
                        dev_record.setError_en(rs.getInt("error_en"));

                        dev_record.setError_dispose(rs.getString("error_dispose"));

                        dev_record.setPicture_num(rs.getInt("picture_num"));

                        dev_record.setError_state(rs.getInt("error_state"));

                        dev_record.setUid(rs.getInt("uid"));

                        dev_record.setUname(rs.getString("uname"));

                        dev_record.setSolve_uid(rs.getInt("solve_uid"));

@@ -203,6 +213,7 @@
         binf.setStationName3("");

         binf.setStationName5("");

         binf.setStationId("");

         binf.setMonCount(-1);

         Page p=new Page();

         p.setPageCurr(1);

         p.setPageSize(10);


 gx_tieta/src/com/fgkj/dto/Deverror_record.java

@@ -18,7 +18,7 @@
    private Date record_time;

    private String error_descript;//问题描述

    private String error_dispose;//问题处理

	
    private int error_state;//问题类型

    private int error_en;         //问题是否解决

    private String note;

    private Page page;

@@ -210,28 +210,28 @@
    public void setSolve_record_time(Date solve_record_time) {

        this.solve_record_time = solve_record_time;

    }

    public int getError_state() {

        return error_state;

    }

    public void setError_state(int error_state) {

        this.error_state = error_state;

    }

    @Override

    public String toString() {

        return "Deverror_record [num=" + num + ", stationId=" + stationId

                + ", stationName=" + stationName + ", stationName1="

                + stationName1 + ", stationName2=" + stationName2

                + ", stationName3=" + stationName3 + ", stationName5="

                + stationName5 + ", record_time=" + record_time

                + ", error_descript=" + error_descript + ", error_dispose="

                + error_dispose + ", error_en=" + error_en + ", note=" + note

                + ", page=" + page + ", uid=" + uid + ", uname=" + uname

                + ", picture_one=" + picture_one + ", picture_two="

                + picture_two + ", picture_three=" + picture_three

                + ", picture_four=" + picture_four + ", picture_num="

                + picture_num + ", solve_uid=" + solve_uid + ", solve_uname="

                + solve_uname + ", solve_picture_one=" + solve_picture_one

                + ", solve_picture_two=" + solve_picture_two

                + ", solve_picture_three=" + solve_picture_three

                + ", solve_picture_four=" + solve_picture_four

                + ", solve_picture_num=" + solve_picture_num

                + ", solve_record_time=" + solve_record_time + "]";

        return "Deverror_record [num=" + num + ", stationId=" + stationId + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3

                + ", stationName5=" + stationName5 + ", record_time=" + record_time + ", error_descript="

                + error_descript + ", error_dispose=" + error_dispose + ", error_state=" + error_state + ", error_en="

                + error_en + ", note=" + note + ", page=" + page + ", uid=" + uid + ", uname=" + uname

                + ", picture_one=" + picture_one + ", picture_two=" + picture_two + ", picture_three=" + picture_three

                + ", picture_four=" + picture_four + ", picture_num=" + picture_num + ", solve_uid=" + solve_uid

                + ", solve_uname=" + solve_uname + ", solve_picture_one=" + solve_picture_one + ", solve_picture_two="

                + solve_picture_two + ", solve_picture_three=" + solve_picture_three + ", solve_picture_four="

                + solve_picture_four + ", solve_picture_num=" + solve_picture_num + ", solve_record_time="

                + solve_record_time + "]";

    }

    

    

    

	
}