From 30d1267479ad9cb076cb2692befc6fe3a53fa7d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 25 Jul 2019 16:04:19 +0800
Subject: [PATCH] 删选监控站点和设备的因子
---
src/main/webapp/js/moralmap.js | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index bc42550..313ae6e 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -508,7 +508,8 @@
function _getMapIcon(state) {
state = state == null ? 0 : state;
var icon = _option["icon"];
- var url = icon["stateIcons"][state];
+ //var url = icon["stateIcons"][state];
+ var url = icon["url"] + state + ".png";
return new BMap.Icon(url, new BMap.Size(icon["width"], icon["height"]), {
imageSize: new BMap.Size(icon["width"], icon["height"])
});
@@ -551,8 +552,17 @@
moralMap.MoralMarker.prototype = new BMap.Marker();
//��������������� ������Mark������
moralMap.Monitorpoint = function(option) {
+ if(monitorPointStates){
+ for(var i in monitorPointStates){
+ var state = monitorPointStates[i];
+ if(state.id == option.id){
+ option.state = state.state;
+ }
+ }
+ }
var icon = {};
icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
+ icon["url"] = "/img/ico0";
icon["width"] = 50;
icon["height"] = 50;
option["icon"] = icon;
@@ -639,8 +649,17 @@
//���������mac���key������
//��������������� ������MoralMark������
moralMap.Equipment = function(option) {
+ if(deviceStates){
+ for(var i in deviceStates){
+ var state = deviceStates[i];
+ if(state.id == option.id){
+ option.state = state.state;
+ }
+ }
+ }
var icon = {};
icon["stateIcons"] = ["/img/ico_coo00.png", "/img/ico_coo01.png", "/img/ico_coo02.png", "/img/ico_coo03.png", "/img/ico_coo04.png"];
+ icon["url"] = "/img/ico_coo0";
icon["width"] = 50;
icon["height"] = 60;
option["icon"] = icon;
@@ -956,32 +975,54 @@
}
moralMap.callJS = function(condition) {
- //$("#searchParam").val(condition);
- //var condition = JSON.parse(condition);
var new_point = new BMap.Point(condition.longitude, condition.latitude);
baiduMap.panTo(new_point);
baiduMap.setCenter(new_point);
+ baiduMap.setZoom(condition.type == "mpoint" ? 17 : 18);
+ var interval = setInterval(function(){
+ var marker;
+ if (condition.type == "mpoint") {
+ marker = moralMap.getMpoint(condition.id);
+ } else if (condition.type == "device") {
+ marker = moralMap.getEquipment(condition.mac);
+ }
+ if(marker){
+ clearInterval(interval);
+ moralMap.openInfoWindow(marker["infoWindow"], new_point);
+ }
+ }, 50);
- if (condition.type == "mpoint") {
- baiduMap.setZoom(17);
- if(moralMap.getMpoint(condition.id)){
- moralMap.openInfoWindow(moralMap.getMpoint(condition.id)["infoWindow"], new_point);
- }else {
- //$("#searchParam").val(condition.id);
- }
- } else if (condition.type == "device") {
- //baiduMap.centerAndZoom(new_point, 18);
- baiduMap.setZoom(18);
- if(moralMap.getEquipment(condition.mac)){
- moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
- } else {
- //var equipment = new moralMap.Equipment(condition);
- //moralMap.openInfoWindow(showInfoWindow, new_point);
- //moralMap.openInfoWindow(equipment["infoWindow"], new_point);
- //moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
- //moralMap.callJS(condition);
- }
- }
+ }
+
+ var deviceStates ;
+ var monitorPointStates;
+ moralMap.refreshState = function(states) {
+ if (!monitorPointStates) {
+ monitorPointStates = states;
+ deviceStates = [];
+ for (var i in states) {
+ var state = states[i];
+ for (var j in state.devices) {
+ var device = state.devices[j];
+ deviceStates.push(device);
+ }
+ }
+ }
+ for (var i in states) {
+ var state = states[i];
+ var mpoint = moralMap.getMpoint(state.id);
+ if (mpoint) {
+ mpoint.refreshState(state.state);
+ }
+ for (var j in state.devices) {
+ var marker = state.devices[j];
+ var marker_mac = marker["mac"];
+ var equipment = moralMap.getEquipment(marker_mac);
+ if (equipment) {
+ equipment.refreshState(marker);
+ }
+ }
+ }
}
--
Gitblit v1.8.0