From 7b94ecb73a12f8804191966da512dc2943225564 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 02 Feb 2021 17:15:21 +0800
Subject: [PATCH] 警情调度与分析研判相关接口,样式调整

---
 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index e20c9c0..0f47dff 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -693,12 +693,12 @@
                     beginTime: beginTime,
                     endTime: endTime,
                     waringType: waringType,
-                    addvcd: addvcd
+                    addvcd: addvcd,
+                    type: ''
                 },
                 success: function (data) {
                     var result = data.data;
                     var str = '';
-                    var lgtdOrLttd = null;
                     that.entitysData = [];
                     that.analysisAddEntitys.clear();
                     for (var a, time, t, e, y, h, i = 0; i < result.length; i++) {
@@ -779,17 +779,15 @@
                 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 +795,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 = '';
@@ -817,17 +815,16 @@
                 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 +832,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