调整 计算平均值算法

xufenglei

2018-03-30 71d49c588d62385a57a2ea5434f3c407a1d5c1ca

 src/main/webapp/view/map.jsp

@@ -113,26 +113,31 @@
   clear: both;
   zoom: 1
}

.list-chart-span {
   cursor: pointer;
   background-color: #4c9bf1
}
.list li {
   padding: 10px 0;
   border-bottom: 1px dotted #eee;
   line-height: 40px;
   height: 40px;
   font-size: 20px;
   cursor: pointer;
   /*cursor: pointer;*/
}

.list span{
   float: right;
   position: relative;
   right: 18px;
   right: 5px;
   border-radius:4px;
   width: 70px;
   width: 40px;
   text-align: center;
   height: 24px;
   line-height: 24px;
   font-size: 16px;
   font-size: 14px;
   font-weight: bolder;
   color:  white;
   margin: 10px 0;
   padding:2px 0;
   margin-right: 8px;
@@ -144,6 +149,7 @@

.list .state01 {
   background-color: #FF9;
    color: #ff7f00;
}

.list .state02 {
@@ -156,9 +162,9 @@
}

.list .state04 {

   background-color: #eee;
   color: #777
   /*background-color: #eee;*/
   /*color: #777 ;*/
   background-color: #738d99 ;
}
         /*
           * 外面盒子样式---自己定义
@@ -314,8 +320,18 @@
      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(),
@@ -333,12 +349,6 @@
                                alert(equStr);
                             }
                          }
                    obj['mouseover'] = function (type) {
                  if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                  }
                    }
               var moralMask = new moralMap.Equipment(obj);
                   moralMap.addOverlay(moralMask);
            }
@@ -374,6 +384,10 @@
   //地图加载完成后 加载监控点,速度慢
   moralMap.addEventListener("tilesloaded", function(type, target) {
   });
   // 点击事件关闭 弹窗列表
    moralMap.addEventListener("click", function(type, target) {
        moralMap.closePopupbox("#popup_box");
    });
   //地图放大缩小事件时，关闭弹窗
   moralMap.addEventListener('zoomstart', function(type) {});
   //地图放大缩小事件时，关闭弹窗