Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

 src/main/webapp/view/map.jsp

@@ -156,9 +156,9 @@
}

.list .state04 {

   background-color: #eee;
   color: #777
   /*background-color: #eee;*/
   /*color: #777 ;*/
   background-color: #738d99 ;
}
         /*
           * 外面盒子样式---自己定义
@@ -314,14 +314,24 @@
      for(var i in objs) {
            var obj = objs[i];
            if(moralMap.getEquipment(obj["mac"])==null){
                    obj['mouseover'] = function (type) {
                        if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                        }
                    }
               obj['click'] = function(){
                           var _obj = this.getOption();
                                       var _obj = this.getOption();
                                       if(_obj['mac']==null){
                                           alert("mac项未配置，请联系管理员设置");
                                           return;
                                       }
                                  var equ = {
                              name: _obj['name'],
                              mac: (_obj['mac']).toLowerCase(),
                              longitude: _obj['longitude'],
                              latitude: _obj['latitude'],
                               version:moralMap.getVersion(_obj['mac'])
                               version:_obj['deviceVersion']['version']
                           }
                           var equStr = JSON.stringify(equ);
                           if(window["console"]!=undefined){
@@ -410,7 +420,7 @@
         }
         setTimeout(function(){
            refreshAllState();
         },2000);
         },5000);
    }
    function stopRefreshPage(){
        window.clearInterval(_intervalNum);