From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改
---
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index 13c1dba..98bbd67 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -211,8 +211,6 @@
var levelText = $('#policeArea > div:eq(0)').text().trim() == '全部' ? '' : $('#policeArea > div:eq(0)').attr('areaid');
that.getPoliceTableAnalysis($('.analysis-container-police').find('.tbody tbody'), startTime, endTime, text == '全部' ? '' : text, levelText);
- $(times[2]).val('');
- $(times[0]).val('');
}
}
@@ -686,22 +684,19 @@
dom.empty();
var that = this;
$.ajax({
- url: 'https://web.byisf.com/api/blade-jfpts/jingdan/jingdan/selectList',
- type: 'POST',
+ url: "https://web.byisf.com/api/blade-jfpts/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
+ type: 'get',
dataType: 'JSON',
- data: {
- beginTime: beginTime,
- endTime: endTime,
- waringType: waringType,
- district: addvcd,
- type: ''
- },
success: function (data) {
- var result = data.data;
+ var result = data.data.records;
var str = '';
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, time, t, e, y, h, i = 0; i < result.length; i++) {
+
+ if (result[i].waringType == "紧急求救") {
+ result[i].waringType = "一键求助"
+ }
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '警情信息', {
lgtd: result[i].jd,
@@ -709,17 +704,16 @@
id: result[i].id
}, result[i].jd, result[i].wd, './images/police-situation.png');
-
- t = result[i].galarmTime.substr(0, 10);
- e = result[i].galarmTime.substr(11);
+ t = result[i].alarmTime.substr(0, 10);
+ e = result[i].alarmTime.substr(11);
time = t + ' ' + e;
- y = result[i].galarmTime.substr(5, 5);
- h = result[i].galarmTime.substr(11, 5);
+ y = result[i].alarmTime.substr(5, 5);
+ h = result[i].alarmTime.substr(11, 5);
a = Number(i) + 1;
str += '<tr term-list=' + result[i].id + '>';
str += '<td>' + a + '</td>';
str += '<td title=' + result[i].waringType + '>' + result[i].waringType + '</td>';
- str += '<td title=' + result[i].addvnm + '>' + result[i].addvnm + '</td>';
+ str += '<td title=' + result[i].alarmPeople + '>' + result[i].alarmPeople + '</td>';
str += "<td><a href='javascript:;' title=" + time + ">" + y + ' ' + h + "</a></td>";
str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
str += '</tr>';
--
Gitblit v1.9.3