From 9880d87f87b074b45150a66867c0d1870e6cb3e2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 06 Aug 2020 14:31:13 +0800
Subject: [PATCH] update
---
src/main/webapp/js/moralmap.js | 183 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 171 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 0ad00e8..4ec747c 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -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,163 @@
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);
}
map.centerAndZoom(point, showZoom);
} else {
@@ -414,7 +574,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -1052,17 +1212,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);
--
Gitblit v1.8.0