From 0c0d0b8d29e9aef360ccde4f2128afff971e5fbd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 25 Mar 2021 17:06:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
public/map/widgets/alertSecurity/AlertSecurity.js | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/public/map/widgets/alertSecurity/AlertSecurity.js b/public/map/widgets/alertSecurity/AlertSecurity.js
index 4123c68..968226a 100644
--- a/public/map/widgets/alertSecurity/AlertSecurity.js
+++ b/public/map/widgets/alertSecurity/AlertSecurity.js
@@ -202,14 +202,10 @@
var lgtd = that.getQueryStringByKey('jd');
var lttd = that.getQueryStringByKey('wd');
- $.ajax({
- url: "https://web.byisf.com/api/blade-jfpts/jingdan/jingdan/detail?id=" + openid,
- type: 'get',
- dataType: 'JSON',
- success: function (data) {
- that.addPoint(that.addEntitys, data.data.jd, data.data.wd, './images/jingbaored.png')
- }
- })
+ console.log(openid, lgtd, lttd, 123465)
+
+ that.addPoint(that.addEntitys, lgtd, lttd, './images/jingbaored.png');
+
$.ajax({
url: "https://web.byisf.com/api/blade-jfpts/position/position/selectfj",
@@ -222,7 +218,7 @@
success: function (data) {
console.log(data)
data.data.forEach(item => {
- that.addPoint(that.addEntitys, item.jd, item.wd, './images/security.png')
+ that.addPoints(that.addEntitys, item.jd, item.wd, './images/security.png')
})
}
})
@@ -283,6 +279,15 @@
},
addPoint: function (entitys, lgtd, lttd, img) {
+ var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
+ var pt = new Point(lgtd, lttd, new SpatialReference({
+ wkid: 4326
+ }));
+ var graphic = new esri.Graphic(pt, symbol);
+ entitys.add(graphic);
+ },
+
+ addPoints: function (entitys, lgtd, lttd, img) {
var symbol = new esri.symbol.PictureMarkerSymbol(img, 20, 20);
var pt = new Point(lgtd, lttd, new SpatialReference({
wkid: 4326
--
Gitblit v1.9.3