添加面板

hdw

2018-11-12 265e07e56a6abfac6c5aa941397dcbca573d18af

添加面板

 gx_tieta/WebRoot/control.jsp

@@ -1799,9 +1799,9 @@
                        

                        var alarmstates = GLOBAL.BTS9100.alarmstates;

                        var lastStopReason = getStateFromIndex(_data.dev_last_captest_stop_type,alarmstates);

                        console.info("上一次核容测试停止原因："+lastStopReason);

                        console.info("通信计数："+_data.dev_commcount);

                        console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));						
                        //console.info("上一次核容测试停止原因："+lastStopReason);

                        //console.info("通信计数："+_data.dev_commcount);

                        //console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));						
                        

                        var nowTime = new Date().getTime();        //当前时间

                        var record = new Date(model.data[0].record_datetime).getTime();

@@ -3457,9 +3457,11 @@
        });

    }

        // 根据设备信息显示对应电路拓扑图

		
        function updateEleCircle(batt, data, mygraph) {

            var status = GLOBAL.circleStatus.status;

            //console.info(status);

            var e61850Opts = GLOBAL.circleStatus.e61850Opts;

            var btsOpts = GLOBAL.circleStatus.btsOpts;

            // 初始化二级管

            changeEleCircleOpt(eleCircle, 'diode', {

                isShowValue: false,

@@ -3477,7 +3479,7 @@
            // 拓扑图图标

            changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1});    // 放电单元

            changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1});    // 充电单元

			
            console.log(data);

            // 没有形参就不做任何操作

            if(data == undefined) {

                status.hide();

@@ -3488,6 +3490,7 @@
            if(regEquipType(data.dev_id, globalPattern.equip61850)) {

                //console.info(data);

                var alarms = data.dev_61850alarms.split(',');

                status.setOpts(e61850Opts);

                status.show();

                //alarms = ['true', 'false', 'true', 'true'];

                // 设置二级管的导通压降

@@ -3528,6 +3531,30 @@
                // 拓扑图图标

                changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:mygraph.graphtype});    // 放电单元

                changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:mygraph.graphtype});    // 充电单元

            }else if(regEquipType(data.dev_id, globalPattern.BTS)){        // 判断如果是BTS9100的设备

                // 设置状态的配置项

                status.setOpts(btsOpts);

				
                // 工作状态

                status.setStatus('workstatus', data.dev_workstate);

				
                // 设置核容停止原因

                if(data.dev_workstate == 2) {

                    status.setStatus('stop', 99);

                }else {

                    status.setStatus('stop', data.dev_last_captest_stop_type);	
                }

				
                // 设置通信计数

                status.setText('count', "通信计数："+data.dev_commcount);

				
                // 设置丢包率

                var errorCount = data.dev_errcommcount;

                var allCount = data.dev_commcount+errorCount;

                var percent= (allCount==0?0:errorCount/allCount*100).toFixed(3);

                status.setText('percent', "通信丢包率："+percent+'%');

				
                status.show();

            }else {

                status.hide();

            }

@@ -4506,7 +4533,8 @@
            $('#sysSet_read').click(function() {

                var batt = getBatt();

                var temp = {

                    dev_id:batt.FBSDeviceId

                    dev_id:batt.FBSDeviceId,

                    num: sysCMD.get

                };

                searchSysData(temp, true);

            });

@@ -4515,7 +4543,8 @@
            $('#sysSet').click(function() {

                var batt = getBatt();

                var temp = {

                    dev_id:batt.FBSDeviceId

                    dev_id:batt.FBSDeviceId,

                    num: sysCMD.get

                };

                searchSysData(temp);

            });


 gx_tieta/WebRoot/js/elecircle.content.js

@@ -813,6 +813,17 @@
        this.ele.append(_ul);

    };



    // 设置配置项

    _prop.setOpts = function(options) {

        this.options = options;

        
        this._init();

        
        if(this.options.length != 0) {

            this.show();

        }

    };

    
    // 根据配置项的值获取li

    _prop._setLi = function(li, option) {

        var _i, _a = $('<a></a>');

@@ -838,6 +849,9 @@
            }

            var list = option.content.list[option.status]?option.content.list[option.status]:'未知';

            var txt = option.content.text+list;

            _a.append(txt);

        }else if(option.type == 'text') {

            var txt = option.content.text;

            _a.append(txt);

        }

        

@@ -884,6 +898,29 @@
            }

        }



    };

    
    // 设置文本内容

    _prop.setText = function(name, text, notShow) {

        var _itemList = this.ele.find('li');

        // 遍历配置项

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

            var _opts = this.options[i];    // 获取当前循环的变量

            // 根据名称确定更改的内容

            if(_opts.name == name) {

                var _tmp = $.extend({}, _opts); // 获取全新对象，避免引用传递

                _tmp.content.text = text;

                
                // 设置是否显示

                if(notShow) {

                    _tmp.notShow = true;

                }else {

                    _tmp.notShow = false;

                }

                
                this._setLi(_itemList.eq(i), _tmp); // 更新li的内容

            }

        }

    };

    var options = [

        {

@@ -935,6 +972,53 @@
            }

        }

    ];

    // 61850配置项

    gl.circleStatus.e61850Opts = options;

    
    var optionsBts = [

        {

            name: 'workstatus',

            type: 'list',

            notShow: false,

            imgCallback: gl.statusImg.getImg,

            status: 0,

            content: {

                list:gl.BTS9100.workstates,

                text: '设备状态:'

            }

        },

        {

            name: 'stop',

            type: 'list',

            status: 0,

            notShow: false,

            content: {

                list:gl.BTS9100.alarmstates,

                text: '上一次核容终止原因：'

            }

        },

        {

            name: 'count',

            type: 'text',

            status: 0,

            notShow: false,

            content: {

                text: '通信计数:'

            }

        },

        {

            name: 'percent',

            type: 'text',

            status: 0,

            notShow: false,

            content: {

                text:'通信丢包率:'

            }

        }

    ];

    // bts9100配置项

    gl.circleStatus.btsOpts = optionsBts;

    
    var status = new Status($('#eleCircleStatus'), options);

    gl.circleStatus.status = status;

    

@@ -955,9 +1039,6 @@
            var data = model.data[0];

            var alarmstatus = data.dev_alarmstate;    //[0:'无',1:'暂停',2:'放电测试',3:'放电等待',4:'限流充电',5:'直流充电',6:'充电等待',7:'测试时间到',8:'测试容量到',9:'单体下限到',10:'组端下限到',11:'市电异常',12:'存储卡不足',13:'负载温度高',14:'电流异常',15:'远程通信坏',16:'负载通信坏',17:'选择通信坏',18:'负载电流坏',19:'内存申请坏',20:'未知'];

            var workstatus =parseInt(data.dev_workstate) ;    //[0:'在线监测',1:'放电测试',2:'充电测试',3:'内阻测试',4:'未知'];

            if(typeof callback == 'function') {

                callback.call({}, data);

            }

            // 判断workstatus

            switch(workstatus) {

                case 0:    {    // 浮充状态

@@ -1020,6 +1101,11 @@
                }

                break;

            }

        	
            // 设置左上方内容

            if(typeof callback == 'function') {

                callback.apply({}, [batt, data, mygraph]);

            }

        }else {

            mygraph.graphtype = 4 ;

            _str = '(未连接)';