From 3d76bad0a7562441d75768f7e4e677f686037582 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 01 Dec 2020 13:16:09 +0800
Subject: [PATCH] 实施页面hour-aqi更新
---
src/main/webapp/js/moralmap.js | 221 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 192 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 0ad00e8..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;
// }
/*
* ���������������������
@@ -46,7 +46,8 @@
moralMap.mapInit = function () {
var defaultParam = {
minZoom: 12,
- maxZoom: 20
+ maxZoom: 20,
+ enableMapClick: false
};
if (!!arguments[1]) {
$.extend(defaultParam, arguments[1]);
@@ -64,6 +65,9 @@
var address = arguments[0];
var regoinNames = address.split(" ");
var cityName = regoinNames.length > 1 ? regoinNames[1] : regoinNames[0];
+ if (cityName == "���������" || cityName == "���" || cityName == "���������������������������") {
+ cityName = regoinNames[2];
+ }
map.setCurrentCity(cityName);
// ���������������������������������������,���������������������
// ���������������������������
@@ -73,7 +77,167 @@
if ("���������" == cityName) {
var longitude = 113.30640743;
var latitude = 40.08256467;
- var point = new BMap.Point(longitude, latitude);
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������" == cityName) {
+ var longitude = 105.733648;
+ var latitude = 38.858951;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������" == cityName) {
+ var longitude = 113.136019;
+ var latitude = 41.001403;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 104.647678;
+ var latitude = 28.758767;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������" == cityName) {
+ var longitude = 92.056768;
+ var latitude = 31.482684;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 105.930055;
+ var latitude = 29.363305;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 105.727253;
+ var latitude = 29.714369;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 106.061728;
+ var latitude = 29.852264;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 106.654609;
+ var latitude = 29.035883;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 106.889359;
+ var latitude = 28.907664;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 107.735181;
+ var latitude = 29.869663;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 107.336118;
+ var latitude = 30.334042;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������" == cityName) {
+ var longitude = 108.04224;
+ var latitude = 30.30452;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 108.671036;
+ var latitude = 31.953145;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 109.576402;
+ var latitude = 31.40266;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 109.879221;
+ var latitude = 31.087199;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 109.468749;
+ var latitude = 31.024849;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������������������" == cityName) {
+ var longitude = 108.118685;
+ var latitude = 30.006859;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������������������������" == cityName) {
+ var longitude = 108.17085;
+ var latitude = 29.301729;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������������������������" == cityName) {
+ var longitude = 108.774583;
+ var latitude = 28.848811;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������������������������" == cityName) {
+ var longitude = 109.011853;
+ var latitude = 28.454209;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 108.656267;
+ var latitude = 19.101378;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.397709;
+ var latitude = 18.799833;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("������������" == cityName) {
+ var longitude = 109.522965;
+ var latitude = 18.782911;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.47882;
+ var latitude = 19.265073;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.105702;
+ var latitude = 19.358194;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.363233;
+ var latitude = 19.686848;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.803934;
+ var latitude = 19.549335;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 110.010636;
+ var latitude = 19.745166;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ var longitude = 109.693419;
+ var latitude = 19.920291;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������������" == cityName) {
+ var longitude = 109.702907;
+ var latitude = 18.647732;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������" == cityName) {
+ var longitude = 110.045039;
+ var latitude = 18.513155;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������������" == cityName) {
+ var longitude = 109.842786;
+ var latitude = 19.041625;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������" == cityName) {
+ var longitude = 109.060164;
+ var latitude = 19.304817;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������������������" == cityName) {
+ var longitude = 109.453447;
+ var latitude = 19.232744;
+ point = new BMap.Point(longitude, latitude);
+ } else if ("���������" == cityName) {
+ 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 {
@@ -126,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) {
//������������������
@@ -414,7 +578,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -583,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) {
@@ -676,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 () {
//���������������
@@ -744,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>";
@@ -1052,17 +1216,16 @@
var deviceStates;
var monitorPointStates;
moralMap.refreshState = function (states) {
- if (!monitorPointStates) {
- monitorPointStates = states;
- deviceStates = [];
- for (var i in states) {
- var state = states[i];
- for (var j in state.devices) {
- var device = state.devices[j];
- deviceStates.push(device);
- }
+ monitorPointStates = states;
+ deviceStates = [];
+ for (var i in states) {
+ var state = states[i];
+ for (var j in state.devices) {
+ var device = state.devices[j];
+ deviceStates.push(device);
}
}
+ listView.refreshState(deviceStates);
for (var i in states) {
var state = states[i];
var mpoint = moralMap.getMpoint(state.id);
@@ -1081,4 +1244,4 @@
}
window.moralMap = moralMap;
-})(jQuery, BMap, window);
+})(jQuery, BMap, window);
\ No newline at end of file
--
Gitblit v1.8.0