From 2685db12198903ccee5b61e65911425776f73bd8 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 16:01:26 +0800
Subject: [PATCH] 修改pom
---
src/main/webapp/js/newmoralmap.js | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index bcb1e24..45f5ed1 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);
@@ -1234,11 +1231,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 +1261,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