From 154b73d12f9e39039fc7b099beab3881c94b2d8d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 21 Nov 2019 12:42:00 +0800
Subject: [PATCH] update：请求合并
---
src/main/webapp/js/moralmap.js | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index f4b025b..124827d 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -654,23 +654,15 @@
//���������mac���key������
//��������������� ������MoralMark������
moralMap.Equipment = function (option) {
- var sensorsMap;
+ var sensorsDescriptionMap;
var sensorsUnitMap;
$.ajax({
url: "getSensorsMap?mac=" + option['mac'],
type: "get",
dataType: "json",
success: function (data) {
- sensorsMap = data.data;
- }
- });
-
- $.ajax({
- url: "getSensorsUnitMap?mac=" + option['mac'],
- type: "get",
- dataType: "json",
- success: function (data) {
- sensorsUnitMap = data.data;
+ sensorsDescriptionMap = data[0];
+ sensorsUnitMap = data[1];
}
});
@@ -844,10 +836,6 @@
}
moralMap.showSensors = function (jsonData) {
- var address = (option["address"] == null) ? "" : option["address"];
- if (address.length > 18) {
- address = address.slice(0, 18) + "...";
- }
var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:400px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
var y, m, d, h, mm, s;
var date = new Date(jsonData['time']);
@@ -861,9 +849,9 @@
adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "��������� " + date + " </p>";
for (var prop in jsonData) {
if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
- for (var key in sensorsMap) {
+ for (var key in sensorsDescriptionMap) {
if (prop == key) {
- var sensorsDescription = sensorsMap[key];
+ var sensorsDescription = sensorsDescriptionMap[key];
}
}
for (var key in sensorsUnitMap) {
--
Gitblit v1.8.0