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

81041

2018-11-12 0cce8cd45143eb6aa19423554ec5bb1f59f3ebfc

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

 gx_tieta/WebRoot/control.jsp

@@ -1216,7 +1216,7 @@
        // 设置页面权限模块

        $(function() {

            var testOp = checkUserPermit(permits, 'batt_test_op_permit');

            console.log(testOp);

            //console.log(testOp);

            if(!testOp) {

                $(".ele-circle .tools-btn").remove();

            }

@@ -3479,10 +3479,20 @@
            // 拓扑图图标

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

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

            console.log(data);

            //console.log(data);

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

            if(data == undefined) {

                status.hide();

                var opts = [{

                    name: 'none',

                    type: 'text',

                    status: 0,

                    notShow: false,

                    content: {

                        text:'设备状态：<span class="red">未连接</span>'

                    }

                }];

                status.setOpts(opts);

                //status.hide();

                return false;    // 结束函数

            }

            

@@ -3518,6 +3528,7 @@
                status.setStatus('msg', isLink);

                // 设置温度信息

                status.setStatus('tmp', alarms[2] == 'true'?0:1);

				
                // 设置核容停止原因

                if(data.dev_workstate == 2) {

                    status.setStatus('stop', 99);

@@ -3539,11 +3550,7 @@
                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.setStatus('stop', data.dev_last_captest_stop_type);

                

                // 设置通信计数

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

@@ -4539,7 +4546,7 @@
                searchSysData(temp, true);

            });

            

            // 点击设置系统参数

            // 点击系统参数按钮

            $('#sysSet').click(function() {

                var batt = getBatt();

                var temp = {

@@ -4571,7 +4578,7 @@
                        var batt = getBatt();

                        var temp = {

                            dev_id: batt.FBSDeviceId,

                            cmd: sysCMD.restart

                            num: sysCMD.restart

                        };

                        

                        /* console.log(temp);

@@ -4702,8 +4709,8 @@
                $('#sysSet_endur').val(data.GroupVolRange);            // 总续航时间

                $('#sysSet_firTime').val(data.GroupVolSorce);            // 保一次下电续航时间

                $('#sysSet_range').val(data.CurrentRange);            // 电流钳量程

                $('#sysSet_firVol').val(data.CurrentTyte);            // 一次下电电压

                $('#sysSet_secVol').val(data.MonomerOrder);            // 二次下电电压

                $('#sysSet_firVol').val(data.CurrentTyte/10);            // 一次下电电压

                $('#sysSet_secVol').val(data.MonomerOrder/10);            // 二次下电电压

                $('#sysSet_dcdc').val(data.LoaderCount);            // DCDC模块数量

                $('#sysSet_sourceStyle').val(data.DtCardCount);        // 单体数据来源类型

                $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt);        // 停电升压榨干电池数量

@@ -4745,8 +4752,8 @@
                    GroupVolRange: endur,

                    GroupVolSorce: firTime,

                    CurrentRange: range,

                    CurrentTyte: firVol,

                    MonomerOrder: secVol,

                    CurrentTyte: firVol*10,

                    MonomerOrder: secVol*10,

                    LoaderCount: dcdc,

                    DtCardCount: sourceStyle,

                    POF_BG_Boost_Cnt:bleedNum,


 gx_tieta/WebRoot/js/elecircle.content.js

@@ -476,12 +476,12 @@
    });

    

    // 拓扑图名称

    eleCircle.drawText({

    /*eleCircle.drawText({

        id: 'title',

        startX: 400,

        startY: 40,

        name: '设备浮充状态电流方向',

    });

    });*/

    

    // 设备内部温度

    eleCircle.drawText({

@@ -980,7 +980,7 @@
            name: 'workstatus',

            type: 'list',

            notShow: false,

            imgCallback: gl.statusImg.getImg,

            //imgCallback: gl.statusImg.getImg,

            status: 0,

            content: {

                list:gl.BTS9100.workstates,


 gx_tieta/WebRoot/js/elecircle.js

@@ -312,7 +312,7 @@
    var opts = $.extend({}, defaults, options || {});

    

    // 根据开关的类型和快关的状态设置value的值获取线包电压

    var lineVol = '线包电压:';

    /*var lineVol = '线包电压:';

    if(opts.id == 'ko') {

        if(opts.stats == 'on') {

            lineVol =lineVol + '0V';

@@ -325,7 +325,7 @@
        }else {

            lineVol =lineVol + '0V';

        }

    }

    }*/

    

    

    

@@ -495,7 +495,7 @@
    }

    

    // 绘制背景色

    this.context.beginPath();

    /*this.context.beginPath();

    this.context.fillStyle = '#FFFFFF';

    var strWidth = getStringWidth(lineVol);

    this.context.rect(valueTxtX,valueTxtY-12,strWidth,14);

@@ -504,7 +504,7 @@
    this.context.strokStyle = '#0000DD';

    this.context.fillStyle = '#0000DD';

    this.context.font = 'bold 12px Arial';

    this.context.fillText(lineVol, valueTxtX, valueTxtY);

    this.context.fillText(lineVol, valueTxtX, valueTxtY);*/



    var switchBtnInfor = {

        options: opts,

@@ -812,17 +812,30 @@
    

    this.context.setLineDash([]);    // 恢复实线

    

    if(opts.name.length > 0) {

        this.context.beginPath();

        this.context.fillStyle = '#FFFFFF';

        this.context.rect(opts.startX-20,opts.startY+16*2+156, 30,32);

        this.context.fill();

    }

	
	
    var textList = opts.name.split('&');

    this.context.fillStyle = opts.strokeStyle;

    var lineHeight = 16;

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

        this.context.fillText(textList[i], opts.startX-20, opts.startY+lineHeight*i+200);

    }

    

	
	
	
	
    // 存储内容

    var dotLineInfor = {

        options: opts,

        type:'drawDotLine',

    }

    };

    this.opts.push(dotLineInfor);

    

    


 gx_tieta/WebRoot/pages/js/pages/control-common.js

@@ -393,8 +393,8 @@
             min = min>0?0:min;

         }

         

         console.info(max);

         console.info(min);

         //console.info(max);

         //console.info(min);

         

         var option={        

            tooltip:{