From 28f0818ba47d9d3f0f3c187356fa89cba2db748a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 26 Oct 2020 16:06:58 +0800
Subject: [PATCH] 设备图标增加和风场风向计算更新
---
src/main/webapp/js/newmoralmap.js | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index f6e05a6..9cdac74 100644
--- a/src/main/webapp/js/newmoralmap.js
+++ b/src/main/webapp/js/newmoralmap.js
@@ -56,6 +56,7 @@
// ���������������������������������������,���������������������
// ���������������������������
var myGeo = new BMap.Geocoder();
+ address = address.replace(/\s*/g, "");
myGeo.getPoint(address, function (point) {
if (point) {
if ("���������" == cityName) {
@@ -217,10 +218,6 @@
} else if ("���������" == cityName) {
var longitude = 106.638135;
var latitude = 29.709625;
- point = new BMap.Point(longitude, latitude);
- } else if ("���������" == regoinNames[2]) {
- var longitude = 120.332826;
- var latitude = 33.772274;
point = new BMap.Point(longitude, latitude);
}
map.centerAndZoom(point, showZoom);
@@ -660,7 +657,11 @@
state = state == null ? 0 : state;
var icon = _option["icon"];
//var url = icon["stateIcons"][state];
- var url = icon["url"] + state + ".png";
+ if (state==5 || state==6){
+ var url = icon["url"] + "0"+state + ".png";
+ }else {
+ 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"])
});
@@ -701,16 +702,18 @@
})
}
+
moralMap.WindMarker = function (option, moralMap) {
var _option = option;
var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
- var _iconObj = _getWindIcon(1);
+ var _iconObj = _getWindIcon(0);
this._point = _pointObj;
function _getWindIcon(speedLevel) {
speedLevel = speedLevel == null ? 0 : speedLevel;
var windIcon = _option["windIcon"];
var windUrl = windIcon["url"] + speedLevel + ".png";
+
return new BMap.Icon(windUrl, new BMap.Size(windIcon["width"], windIcon["height"]), {
imageSize: new BMap.Size(windIcon["width"], windIcon["height"])
});
@@ -721,6 +724,8 @@
offset: new BMap.Size(0, -11),
enableMassClear: true
})
+
+
return $.extend(this, {
refreshWindDir: function (windDir, windSpeed) {
//���������������������������������������������
@@ -750,7 +755,6 @@
if (speedLevel == 0) {
moralMap.removeOverlay(this);
} else {
- moralMap.addOverlay(this);
var iconObj = _getWindIcon(speedLevel);
this.setIcon(iconObj);
this.setRotation(windDir);
@@ -762,7 +766,8 @@
},
setOption: function (option) {
_option = option;
- }
+ },
+
})
}
@@ -781,7 +786,7 @@
}
}
var icon = {};
- icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
+ icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico05.png", "/img/ico06.png"];
icon["url"] = "/img/ico0";
icon["width"] = 50;
icon["height"] = 50;
@@ -906,7 +911,7 @@
}
}
var icon = {};
- icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
+ icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico005.png", "/img/ico006.png"];
icon["url"] = "/img/ico0";
icon["width"] = 50;
icon["height"] = 50;
@@ -1205,7 +1210,57 @@
var deviceStates;
var monitorPointStates;
- moralMap.refreshState = function (states) {
+ moralMap.refreshState = function (states, orgId, regionCode, accountId) {
+ var state = JSON.stringify(states);
+ var state1 = $(".pp2").html()
+ var paramMap = {};
+ var abc = '';
+ paramMap["orgId"] = orgId;
+ paramMap["regionCode"] = regionCode;
+ paramMap["accountId"] = accountId;
+ paramMap["states"] = state;
+ paramMap["states1"] = state1;
+ $.ajax({
+ url: "/screen/tellAlarm",
+ type: "post",
+ dataType: "json",
+ data: paramMap,
+ success: function (info) {
+ var alarm = JSON.parse(JSON.stringify(info));
+ if (alarm.length > 0) {
+ $("#box").attr("style", "display:block;");//������div
+ $("#tou").attr("style", "display:block;color: #d9534f;font-size: 20px;");//������div
+ for (var i = 0; i < alarm.length; i++) {
+ var text = "<span style='line-height: 25px><p style='line-height: 25px'>";
+ var lookString = alarm[i][0]["time"] + " " + alarm[i][0]["name"];
+ for (var j = 0; j < alarm[i].length; j++) {
+ var value = "";
+ if (alarm[i].length > 1) {
+ if (j == 0) {
+ value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
+ lookString = lookString + value;
+ } else {
+ value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
+ lookString = lookString + "," + value;
+ }
+ } else {
+ value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
+ lookString = lookString + value;
+ }
+ text = text + lookString + "������" + "</p><hr></hr></span>";
+ $("#box1").prepend(text);
+ }
+
+ }
+ for (var j = 0; j < $("#box1").children("span").length; j++) {
+ if ($("#box1").children("span").length > 50) {
+ $("#box1 span:last").remove() ;
+ }
+ }
+ }
+ },
+ })
+ state1 = $(".pp2").html(state);
monitorPointStates = states;
deviceStates = [];
for (var i in states) {
@@ -1233,6 +1288,45 @@
}
}
+
+ moralMap.getRoad = function (data, regionCode) {
+
+ var wind = data["e23"];
+ var mac = data["mac"];
+ var windSpeed = data["e18"];
+ var speedLevel;
+ if (windSpeed >= 0 && windSpeed <= 0.2) {
+ speedLevel = 0;
+ } else if (windSpeed > 0.2 && windSpeed <= 1.5) {
+ speedLevel = 1;
+ } else if (windSpeed > 1.5 && windSpeed <= 3.3) {
+ speedLevel = 2;
+ } else if (windSpeed > 3.3 && windSpeed <= 5.4) {
+ speedLevel = 3;
+ } else if (windSpeed > 5.4 && windSpeed <= 7.9) {
+ speedLevel = 4;
+ } else if (windSpeed > 7.9 && windSpeed <= 10.7) {
+ speedLevel = 5;
+ } else if (windSpeed > 10.7 && windSpeed <= 13.8) {
+ speedLevel = 6;
+ } else if (windSpeed > 13.8 && windSpeed <= 17.1) {
+ speedLevel = 7;
+ } else if (windSpeed > 17.1) {
+ speedLevel = 8;
+ }
+
+ $.ajax({
+ url: "/screen/getAlarm",
+ type: "get",
+ dataType: "json",
+ data: {"windData": wind, "code": regionCode, "mac": mac, "speedLevel": speedLevel},
+ success: function (info) {
+ console.log("---------------" + info);
+ },
+
+ })
+ }
+
moralMap.refreshWindDir = function (devicesInfo) {
var deviceInfo = devicesInfo;
var mac = deviceInfo["mac"];
--
Gitblit v1.8.0