From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/js/newmoralmap.js | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index bcb1e24..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) {
@@ -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);
@@ -701,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"])
});
@@ -721,6 +720,8 @@
offset: new BMap.Size(0, -11),
enableMassClear: true
})
+
+
return $.extend(this, {
refreshWindDir: function (windDir, windSpeed) {
//���������������������������������������������
@@ -750,7 +751,6 @@
if (speedLevel == 0) {
moralMap.removeOverlay(this);
} else {
- moralMap.addOverlay(this);
var iconObj = _getWindIcon(speedLevel);
this.setIcon(iconObj);
this.setRotation(windDir);
@@ -762,7 +762,8 @@
},
setOption: function (option) {
_option = option;
- }
+ },
+
})
}
@@ -1205,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) {
@@ -1234,11 +1285,11 @@
}
- moralMap.getRoad=function(data,regionCode){
+ moralMap.getRoad = function (data, regionCode) {
- var wind =data["e23"];
- var mac=data["mac"];
- var windSpeed=data["e18"] ;
+ var wind = data["e23"];
+ var mac = data["mac"];
+ var windSpeed = data["e18"];
var speedLevel;
if (windSpeed >= 0 && windSpeed <= 0.2) {
speedLevel = 0;
@@ -1264,9 +1315,9 @@
url: "/screen/getAlarm",
type: "get",
dataType: "json",
- data:{"windData":wind,"code":regionCode,"mac":mac,"speedLevel":speedLevel},
+ data: {"windData": wind, "code": regionCode, "mac": mac, "speedLevel": speedLevel},
success: function (info) {
- console.log("---------------"+info);
+ console.log("---------------" + info);
},
})
--
Gitblit v1.8.0