From 3a4442da13b6f1300956bd63a5d106c5b2fc7184 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:00 +0800
Subject: [PATCH] update(post)
---
src/main/webapp/js/newmoralmap.js | 189 +++++++++++++++++++++++++++++++++--------------
1 files changed, 133 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index 3de9fe4..1c68869 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) {
@@ -395,7 +396,7 @@
var timer = setTimeout(function () {
baiduMap.closeInfoWindow.apply(baiduMap, arguments);
moralMap["_closeInfoWinTimer"] = null;
- }, 1200);
+ }, 500);
moralMap["_closeInfoWinTimer"] = timer;
}
moralMap.clearOverlays = function () {
@@ -697,16 +698,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"])
});
@@ -717,6 +720,8 @@
offset: new BMap.Size(0, -11),
enableMassClear: true
})
+
+
return $.extend(this, {
refreshWindDir: function (windDir, windSpeed) {
//���������������������������������������������
@@ -746,7 +751,6 @@
if (speedLevel == 0) {
moralMap.removeOverlay(this);
} else {
- moralMap.addOverlay(this);
var iconObj = _getWindIcon(speedLevel);
this.setIcon(iconObj);
this.setRotation(windDir);
@@ -758,7 +762,8 @@
},
setOption: function (option) {
_option = option;
- }
+ },
+
})
}
@@ -944,56 +949,47 @@
}
var mouseOverHandle = option['mouseover'];
moralMarker.addEventListener("mouseover", function () {
- var obj = {};
- obj['methodName'] = 'deliverMac';
- obj['mac'] = option['mac'];
- var objStr = JSON.stringify(obj);
- if (!!window['external'] && !!window['external']['callWin']) {
- window['external'].callWin(objStr);
- } else {
- alert(objStr);
- }
-
moralMap.showSensors = function (jsonData) {
- /* var deviceSensors = jsonData;
- var mac = deviceSensors["mac"];
- if (mac == option['mac']) {*/
+ var deviceSensors = jsonData;
+ var mac = deviceSensors["mac"];
if (!jsonData.hasOwnProperty('mac')) {
infoWindow.setContent("");
infoWindow.redraw();
} else {
- var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:480px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
- var y, m, d, h, mm, s;
- var date = new Date($.now());
- y = 1900 + date.getYear();
- m = "0" + (date.getMonth() + 1);
- d = "0" + date.getDate();
- h = "0" + date.getHours();
- mm = "0" + date.getMinutes();
- s = "0" + date.getSeconds();
- date = y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length) + " " + h.substring(h.length - 2, h.length) + ":" + mm.substring(mm.length - 2, mm.length) + ":" + s.substring(s.length - 2, s.length);
- adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "��������� " + date + " </p>";
- for (var prop in jsonData) {
- if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
- for (var key in sensorsDescriptionMap) {
- if (prop == key) {
- var sensorsDescription = sensorsDescriptionMap[key];
- }
- }
- for (var key in sensorsUnitMap) {
- if (prop == key) {
- var sensorsUnit = sensorsUnitMap[key];
- if (sensorsUnit == null) {
- sensorsUnit = "";
+ if (mac == option['mac']) {
+ var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:480px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
+ var y, m, d, h, mm, s;
+ var date = new Date($.now());
+ y = 1900 + date.getYear();
+ m = "0" + (date.getMonth() + 1);
+ d = "0" + date.getDate();
+ h = "0" + date.getHours();
+ mm = "0" + date.getMinutes();
+ s = "0" + date.getSeconds();
+ date = y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length) + " " + h.substring(h.length - 2, h.length) + ":" + mm.substring(mm.length - 2, mm.length) + ":" + s.substring(s.length - 2, s.length);
+ adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "��������� " + date + " </p>";
+ for (var prop in jsonData) {
+ if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
+ for (var key in sensorsDescriptionMap) {
+ if (prop == key) {
+ var sensorsDescription = sensorsDescriptionMap[key];
}
}
+ for (var key in sensorsUnitMap) {
+ if (prop == key) {
+ var sensorsUnit = sensorsUnitMap[key];
+ if (sensorsUnit == null) {
+ sensorsUnit = "";
+ }
+ }
+ }
+ adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "���" + jsonData[prop] + sensorsUnit + "</p>");
}
- adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "���" + jsonData[prop] + sensorsUnit + "</p>");
}
+ adressOutHtml += "</div>";
+ infoWindow.setContent(adressOutHtml);
+ infoWindow.redraw();
}
- adressOutHtml += "</div>";
- infoWindow.setContent(adressOutHtml);
- infoWindow.redraw();
}
}
// }
@@ -1004,14 +1000,6 @@
});
moralMarker.addEventListener("mouseout", function () {
- var obj = {};
- obj['methodName'] = 'stopDeliverMac';
- var objStr = JSON.stringify(obj);
- if (!!window['external'] && !!window['external']['callWin']) {
- window['external'].callWin(objStr);
- } else {
- alert(objStr);
- }
moralMap.closeInfoWindow();
});
@@ -1118,15 +1106,15 @@
if (longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
markers.push(oldmarker);
}
- if("���������"===option["monitorPoint"]["description"]){
+ if ("���������" === option["monitorPoint"]["description"]) {
var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
var mark05 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon05});
markers.push(mark05);
- }else if("���������"===option["monitorPoint"]["description"]){
+ } else if ("���������" === option["monitorPoint"]["description"]) {
var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
var mark06 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon06});
markers.push(mark06);
- }else if("���������"===option["monitorPoint"]["description"]){
+ } else if ("���������" === option["monitorPoint"]["description"]) {
var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
var mark08 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon08});
markers.push(mark08);
@@ -1218,7 +1206,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) {
@@ -1246,6 +1284,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