hdw
2018-11-13 854f2b7f6876c25ec12290c8f2d39671113b35f8
更改信号强度显示的位置
2个文件已修改
48 ■■■■■ 已修改文件
gx_tieta/WebRoot/control.jsp 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/elecircle.content.js 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/control.jsp
@@ -4353,6 +4353,8 @@
            // 电池组
            treeView.ele.on('click', '.eleGroup', function() {
                var eleGroup = $(this).data('attr');
                var status = GLOBAL.circleStatus.status;
                var btsOpts = GLOBAL.circleStatus.btsOpts;
                // 根据BattGroupId查询数据
                if(BattGroupId != eleGroup.BattGroupId) {
                    BattGroupId = eleGroup.BattGroupId;
@@ -4378,7 +4380,11 @@
                    // 负载电流
                    var loadCurr = batt.Load_curr+'A';
                    changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流:'+loadCurr});
                    changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
                    //changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
                    // 显示信号强度
                    status.setText('signal', '', true);
                    // 更新配置项的值
                    status.updateOpts('signal', btsOpts, {notShow: true});
                    // 最大核容电流
                    var disCurrMax = batt.DisCurrMax+'A';
                    changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流:'+disCurrMax});
@@ -4811,6 +4817,9 @@
            // 点击查看当前信号的质量
            $('#signalBtn').click(function() {
                var batt = getBatt();
                var status = GLOBAL.circleStatus.status;
                var btsOpts = GLOBAL.circleStatus.btsOpts;
                //var btsOpts = GLOBAL.circleStatus.btsOpts;
                signalSearch.dev_id = batt.FBSDeviceId;
                var load = layer.load(1);
                // 请求后台获取信号的质量
@@ -4836,7 +4845,12 @@
                    
                    // 图片描述
                    signalOpts.name = '信号强度:'+signalInfo.signal;
                    changeEleCircleOpt(eleCircle, 'signal', signalOpts);
                    //console.log(signalOpts.name);
                    // 显示信号强度
                    status.setText('signal', signalOpts.name);
                    // 更新配置项的值
                    status.updateOpts('signal', btsOpts, {notShow: false});
                    //changeEleCircleOpt(eleCircle, 'signal', signalOpts);
                });
                
            });
gx_tieta/WebRoot/js/elecircle.content.js
@@ -930,6 +930,18 @@
            }
        }
    };
    // 更新配置项的值
    _prop.updateOpts = function(name, options, update) {
        // 遍历配置项
        for(var i =0; i<options.length; i++) {
            var _opts = options[i];    // 获取当前循环的变量
            // 根据名称确定更改的内容
            if(_opts.name == name) {
                $.extend(_opts, update);
            }
        }
    };
    var options = [
        {
            name: 'workstatus',
@@ -1011,7 +1023,7 @@
            status: 0,
            notShow: false,
            content: {
                text: '通信计数:'
                text: '通信计数:'
            }
        },
        {
@@ -1020,16 +1032,30 @@
            status: 0,
            notShow: false,
            content: {
                text:'通信丢包率:'
                text:'通信丢包率:'
            }
        },
        {
            name: 'signal',
            type: 'text',
            status: 0,
            notShow: true,
            content:  {
                text: '信号强度:'
            }
        }
    ];
    // bts9100配置项
    gl.circleStatus.btsOpts = optionsBts;
    
    // 61850拓扑图状态
    var status = new Status($('#eleCircleStatus'), options);
    gl.circleStatus.status = status;
    
    // BTS9100拓扑图状态
    var statusBts = new Status($('#eleCircleStatus'), optionsBts);
    gl.circleStatus.statusBts = statusBts;
    // 设置全局验证设备类型的正则表达式
    var globalPattern = {
        LD9: /^40190/,