提交内容

hdw

2018-10-25 3d175b70811d8da4258aa0ec6cc6d79ff912b36f

提交内容

 gx_tieta/WebRoot/control.jsp

@@ -1425,7 +1425,7 @@
        //根据设备id查询设备当前的开关状态

        function searchDevStatusByDev_id(){

            var obj = getBatt();

            //console.info(obj);

            console.info(obj);

            var lasttype = mygraph.graphtype;    //记录上一次的状态

            $.ajax({     

                type: "post",                 

@@ -1438,7 +1438,8 @@
                success: function(data){ 

                    data = eval("("+data+")");

                    var model = eval("("+data.result+")");

                    //console.log(model);

                    console.log(model);

					
                    var outTime = 2*60;                //设备超时时间(2分钟)

                    var isOutTime = true;            //通讯中断        判断设备是否通讯中断    true:中断    false:正常

                    var batt = getBatt();            //获取当前选中的电池组

@@ -1450,6 +1451,8 @@
                    }else {

                        _str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);

                    }

                    console.log(mygraph);

                    debugger;

                    if(model.code == 1) {

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

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

@@ -3955,6 +3958,7 @@
                    }

                    mygraph.ischange = 1;                //重新绘制拓扑图

                    

					
                    // 负载电流

                    var loadCurr = batt.Load_curr+'A';

                    changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

@@ -3966,6 +3970,7 @@
                    getBattStr();

                    searchBattAlarmParam();                //查询电池告警参数

                    clearInterval(time);

                    mygraph.graphtype = 4;

                    showtable();

                    time=window.setInterval("showtable()",4000);

                }


 gx_tieta/WebRoot/js/elecircle.content.js

@@ -945,7 +945,6 @@
            if(typeof callback == 'function') {

                callback.call({}, data);

            }

        	
            // 判断workstatus

            switch(workstatus) {

                case 0:    {    // 浮充状态