From 53217a560fecddcf8ff5b7583532f49381b14d80 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 24 Aug 2020 08:38:30 +0800
Subject: [PATCH] 风场图update
---
src/main/webapp/view/newmap.jsp | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index d3e7710..1ad7ba7 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -340,7 +340,8 @@
background: url(/img/charts_btn_bg_2.png) left top no-repeat;
background-size: 70%;
}
- .wind_explain{
+
+ .wind_explain {
position: absolute;
height: 200px;
width: 110px;
@@ -348,15 +349,18 @@
top: 110px;
z-index: 1;
}
- .wind_explain li{
+
+ .wind_explain li {
height: 25px;
}
- .wind_explain li span{
+
+ .wind_explain li span {
display: inline-block;
height: 25px;
line-height: 25px;
}
- .wind_explain li img{
+
+ .wind_explain li img {
vertical-align: top;
}
</style>
@@ -518,6 +522,19 @@
alert(equStr);
}
}
+ if("���������"===obj["monitorPoint"]["description"]){
+ var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
+ var mark05 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon05});
+ moralMap.addOverlay(mark05);
+ }else if("���������"===obj["monitorPoint"]["description"]){
+ var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
+ var mark06 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
+ moralMap.addOverlay(mark06);
+ }else if("���������"===obj["monitorPoint"]["description"]){
+ var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
+ var mark08 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
+ moralMap.addOverlay(mark08);
+ }
var moralMask = new moralMap.Equipment(obj);
moralMap.addOverlay(moralMask);
if (obj['hasWindInfo'] && obj['state'] != 4) {
@@ -677,7 +694,7 @@
if (typeof (WebSocket) === "undefined") {
alert("������������������������WebSocket");
} else {
- ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId+'_'+regionCode);
+ ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId + '_' + regionCode);
ws.onopen = function () {
};
@@ -685,9 +702,9 @@
ws.onmessage = function (msg) {
// $("#searchParam").val(JSON.parse(msg.data));
moralMap.refreshWindDir(JSON.parse(JSON.parse(msg.data)));
- /* if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
- moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
- }*/
+ /* if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
+ moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
+ }*/
};
//������������
--
Gitblit v1.8.0