From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/webapp/js/newmoralmap.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index fc5b556..b8e706f 100644
--- a/src/main/webapp/js/newmoralmap.js
+++ b/src/main/webapp/js/newmoralmap.js
@@ -218,6 +218,10 @@
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);
} else {
@@ -1122,13 +1126,13 @@
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("���������"===obj["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(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
+ var mark06 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon06});
markers.push(mark06);
- }else if("���������"===obj["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(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
+ var mark08 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon08});
markers.push(mark08);
}
}
--
Gitblit v1.8.0