hdw
2018-12-24 9876e29a3ae6fb3d70096f582d0260a59760f9f1
添加问题类型
6个文件已修改
98 ■■■■ 已修改文件
gx_tieta/WebRoot/Top.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-fault-manage.jsp 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/elecircle.content.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/js/common.js 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/Top.jsp
@@ -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/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/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的命名空间