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 | 67 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index e20c9c0..98bbd67 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -1,5 +1,5 @@
/*
- * @Description:
+ * @Description:
* @Version: 1.0
* @Author: yangsx
* @Date: 2019-12-09 19:01:40
@@ -205,14 +205,12 @@
});
return;
} else {
-
+
var text = $('#policeCategory div:eq(0)').text().trim();
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('');
}
}
@@ -663,13 +661,13 @@
dom.children('.select-list').children('ul').append($("<li areaid='all'>全部</li>"));
var that = this;
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/district/district/selectd',
+ url: 'https://web.byisf.com/api/blade-system/region/select?code=3601',
type: 'GET',
dataType: 'JSON',
success: function (data) {
var res = data.data;
for (var i = 0; i < res.length; i++) {
- dom.children('.select-list').children('ul').append($("<li areaid=" + res[i].addvcds + ">" + res[i].addvnm + "</li>"));
+ dom.children('.select-list').children('ul').append($("<li areaid=" + res[i].code + ">" + res[i].name + "</li>"));
}
}
})
@@ -686,22 +684,19 @@
dom.empty();
var that = this;
$.ajax({
- url: 'https://s16s652780.51mypc.cn/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,
- addvcd: addvcd
- },
success: function (data) {
- var result = data.data;
+ var result = data.data.records;
var str = '';
- var lgtdOrLttd = null;
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].handleTime.substr(0, 10);
- e = result[i].handleTime.substr(11);
+ t = result[i].alarmTime.substr(0, 10);
+ e = result[i].alarmTime.substr(11);
time = t + ' ' + e;
- y = result[i].handleTime.substr(5, 5);
- h = result[i].handleTime.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>';
@@ -741,7 +735,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li ownerid='all'>全部</li>"));
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/lx/lx/seleclx',
+ url: 'https://web.byisf.com/api/blade-jfpts/lx/lx/seleclx',
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -757,7 +751,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li>全部</li>"));
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/dj/dj/selectName?tnumbers=' + tnumbers,
+ url: 'https://web.byisf.com/api/blade-jfpts/dj/dj/selectName?tnumbers=' + tnumbers,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -773,23 +767,21 @@
dom.empty();
var that = this;
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
+ url: 'https://web.byisf.com/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
type: 'GET',
dataType: 'JSON',
success: function (data) {
var result = data.data;
var str = '';
- var lgtdOrLttd = null;
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, i = 0; i < result.length; i++) {
- lgtdOrLttd = result[i].coordinate.substring(6, result[i].coordinate.length - 1).split(' ');
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '业主信息', {
- lgtd: lgtdOrLttd[0],
- lttd: lgtdOrLttd[1],
+ lgtd: result[i].jd,
+ lttd: result[i].wd,
id: result[i].id
- }, lgtdOrLttd[0], lgtdOrLttd[1], './images/owner.png');
+ }, result[i].jd, result[i].wd, './images/owner.png');
a = Number(i) + 1;
str += "<tr term-list=" + result[i].id + ">";
@@ -797,7 +789,7 @@
str += '<td>' + result[i].type + '</td>';
str += '<td>' + result[i].dj + '</td>';
str += '<td>' + result[i].yname + '</td>';
- str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + lgtdOrLttd[0] + ' lttd=' + lgtdOrLttd[1] + "></td>";
+ str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
str += '</tr>';
dom.append(str);
str = '';
@@ -811,23 +803,22 @@
dom.empty();
var that = this;
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/equipment/equipment/selectList?deviceType=' + deviceType,
+ url: 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/selectList?deviceType=' + deviceType,
type: 'GET',
dataType: 'JSON',
success: function (data) {
var result = data.data;
var str = '';
- var lgtdOrLttd = null;
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, i = 0; i < result.length; i++) {
- lgtdOrLttd = result[i].coordinate.substring(6, result[i].coordinate.length - 1).split(' ');
+
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '设备信息', {
- lgtd: lgtdOrLttd[0],
- lttd: lgtdOrLttd[1],
+ lgtd: result[i].jd,
+ lttd: result[i].wd,
id: result[i].id
- }, lgtdOrLttd[0], lgtdOrLttd[1], './images/ceshi.png');
+ }, result[i].jd, result[i].wd, './images/ceshi.png');
a = Number(i) + 1;
str += "<tr term-listid=" + result[i].id + ">";
@@ -835,7 +826,7 @@
str += '<td title=' + result[i].deviceName + '>' + result[i].deviceName + '</td>';
str += '<td title=' + result[i].deviceType + '>' + result[i].deviceType + '</td>';
str += '<td>' + result[i].deviceNumber + '</td>';
- str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + lgtdOrLttd[0] + ' lttd=' + lgtdOrLttd[1] + "></td>";
+ str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
str += '</tr>';
dom.append(str);
str = '';
--
Gitblit v1.9.3