From 73d941a21178e76d3e923afbc97f57b875b6eb97 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 01 Dec 2020 15:33:23 +0800
Subject: [PATCH] aqi计算
---
src/main/webapp/js/moralmap.js | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 8f3c84a..049a8f8 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -27,18 +27,18 @@
* ������mac������������version
*/
// moralMap.getVersion = function(mac){
- // var version = null;
- // $.ajax({
- // type:"get",
- // url:"getversion?mac="+mac,
- // async:false,
- // success:function(jsonData){
- // if(jsonData!=null&&typeof jsonData=='object'){
- // version = jsonData['version'];
- // }
- // }
- // });
- // return version;
+ // var version = null;
+ // $.ajax({
+ // type:"get",
+ // url:"getversion?mac="+mac,
+ // async:false,
+ // success:function(jsonData){
+ // if(jsonData!=null&&typeof jsonData=='object'){
+ // version = jsonData['version'];
+ // }
+ // }
+ // });
+ // return version;
// }
/*
* ���������������������
@@ -218,6 +218,26 @@
var longitude = 109.588035;
var latitude = 19.526327;
point = new BMap.Point(longitude, latitude);
+ } else if ("������������������������������" == cityName) {
+ var longitude = 103.380977;
+ var latitude = 23.380877;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������������" == cityName) {
+ var longitude = 100.800568;
+ var latitude = 22.023519;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 100.972567;
+ var latitude = 22.830712;
+ point = new BMap.Point(longitude, latitude);
+ } 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);
} else {
@@ -270,7 +290,7 @@
var endZoom = baiduMap.getZoom();
var startZoom = moralMap.startZoom();
//������key������������������
- // var key = moralMap.lazyKeyer();
+ // var key = moralMap.lazyKeyer();
var confine = moralMap.getZoomConfine();
if (endZoom > startZoom) {
//������������������
@@ -727,7 +747,7 @@
icon["height"] = 50;
option["icon"] = icon;
var moralMarker = new moralMap.MoralMarker(option);
- // var mark =new BMap.Marker(pointObj,{icon:iconObj});
+ // var mark =new BMap.Marker(pointObj,{icon:iconObj});
//==================infoWindow-start============================
var infoWindow;
if (moralMarker["infoWindow"] == undefined) {
@@ -820,7 +840,7 @@
option["online_width"] = 355;
option["online_height"] = 385;
var moralMarker = new moralMap.MoralMarker(option);
- // var mark =new BMap.Marker(pointObj,{icon:iconObj});
+ // var mark =new BMap.Marker(pointObj,{icon:iconObj});
//==================infoWindow-start============================
var infoWindow = (function () {
//���������������
@@ -888,7 +908,7 @@
var name = sensorNames[key][0];
var unit = sensorNames[key][1];
var itme_state = dataHandle._getSensorState(data, key);
-// var itme_name_mac_key = "item-name-" + mac + "-" + key;
+// var itme_name_mac_key = "item-name-" + mac + "-" + key;
var itme_data_mac_key = "item-data-" + mac + "-" + key;
var item = "<li>";
item += "<p>"+name+"</p>";
@@ -1224,4 +1244,4 @@
}
window.moralMap = moralMap;
-})(jQuery, BMap, window);
+})(jQuery, BMap, window);
\ No newline at end of file
--
Gitblit v1.8.0