From d874cdc354465eeed76f7039de9e4d7e5b17dabc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 20 Apr 2021 18:23:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 public/map/widgets/alertSecurity/AlertSecurity.js |  124 ++++++++++++++++++++++++-----------------
 1 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/public/map/widgets/alertSecurity/AlertSecurity.js b/public/map/widgets/alertSecurity/AlertSecurity.js
index 8844276..a8e54c0 100644
--- a/public/map/widgets/alertSecurity/AlertSecurity.js
+++ b/public/map/widgets/alertSecurity/AlertSecurity.js
@@ -204,8 +204,10 @@
       var deptId = that.getQueryStringByKey('deptId');
       var oneId = that.getQueryStringByKey('oneId');
 
+      that.createEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
+      that.createTwinkleEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
       that.addPoint(that.addEntitys, lgtd, lttd, './images/jingbaored.png');
-     
+      
       $.ajax({
         url: "https://web.byisf.com/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
         type: 'get',
@@ -232,65 +234,83 @@
     close: function () {
 
     },
-    // 获取当前时间,以及昨天现在的时间
-    getTime: function getTime() {
-      var timestamp = Date.parse(new Date());
-
-      // 当前时间
-      var currentTime = new Date(timestamp);
-      // 年
-      var currentY = currentTime.getFullYear();
-      // 月
-      var currentM = currentTime.getMonth() + 1 < 10 ? '0' + (currentTime.getMonth() + 1) : currentTime.getMonth() + 1;
-      // 日
-      var currentD = currentTime.getDate() < 10 ? '0' + currentTime.getDate() : currentTime.getDate();
-      // 时
-      var currentH = currentTime.getHours() < 10 ? '0' + currentTime.getHours() : currentTime.getHours();
-      // 分
-      var currentDd = currentTime.getMinutes() < 10 ? '0' + currentTime.getMinutes() : currentTime.getMinutes();
-      // 明天
-      var tomorrowTime = new Date(timestamp - 60 * 60 * 24 * 1000);
-      // 年
-      var tomorrowY = tomorrowTime.getFullYear();
-      // 月
-      var tomorrowM = tomorrowTime.getMonth() + 1 < 10 ? '0' + (tomorrowTime.getMonth() + 1) : tomorrowTime.getMonth() + 1;
-      // 日
-      var tomorrowD = tomorrowTime.getDate() < 10 ? '0' + tomorrowTime.getDate() : tomorrowTime.getDate();
-      // 时
-      var tomorrowH = tomorrowTime.getHours() < 10 ? '0' + tomorrowTime.getHours() : tomorrowTime.getHours();
-      // 分
-      var tomorrowDd = tomorrowTime.getMinutes() < 10 ? '0' + tomorrowTime.getMinutes() : tomorrowTime.getMinutes();
-      return {
-        current: currentY + '-' + currentM + '-' + currentD + ' ' + currentH + ':' + currentDd,
-        tomorrow: tomorrowY + '-' + tomorrowM + '-' + tomorrowD + ' ' + tomorrowH + ':' + tomorrowDd,
-        month: currentM + currentD
-      };
-    },
-
-    // 创建实体图层
-    createEntitys: function (entitys, entityContent, name, item, lgtd, lttd, outlineColors) {
-
-      var symbol = new esri.symbol.PictureMarkerSymbol(outlineColors, 26, 26);
-      symbol.name = name;
-      var pt = new Point(lgtd, lttd, new esri.SpatialReference({
-        wkid: 4326
-      }));
-      pt.entityData = item;
-      var graphic = new esri.Graphic(pt, symbol);
-      entitys.add(graphic);
-
-
-      entityContent.push(item);
-    },
 
     addPoint: function (entitys, lgtd, lttd, img) {
-      var symbol = new esri.symbol.PictureMarkerSymbol(img, 33, 48);
+      var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
+      symbol.xoffset = 0; 
+      symbol.yoffset = -2;
       var pt = new Point(lgtd, lttd, new SpatialReference({
         wkid: 4326
       }));
       var graphic = new esri.Graphic(pt, symbol);
       entitys.add(graphic);
     },
+    /**
+     * 添加实体的公共方法
+     * @param {*} entitys 实体类
+     * @param {Array} entityContent 存放每个点详细数据的数组
+     * @param {string} name 实体的名字
+     * @param {*} item 实体数据
+     * @param {*} lgtd 经度
+     * @param {*} lttd 纬度
+     * @param {*} outlineColors 颜色
+     */
+    createEntitys: function (entitys, lgtd, lttd, image) {
+
+      var symbol = new esri.symbol.PictureMarkerSymbol(image, 44, 44);
+   
+      var width = 44;
+      var height = 44;
+      var pt = new Point(lgtd, lttd, new SpatialReference({
+        wkid: 4326
+      }));
+
+      var graphic = new esri.Graphic(pt, symbol);
+
+      setInterval(function () {
+        if (width >= 60) {
+          width = 44;
+          height = 44;
+        }
+        width += 1;
+        height += 1;
+        symbol.width = width;
+        symbol.height = height;
+        graphic.setSymbol(symbol)
+        entitys.add(graphic);
+      }, 50)
+
+    },
+    /**
+     * 添加闪烁实体的公共方法
+     * @param {*} entitys 实体类
+     * @param {*} lgtd 经度
+     * @param {*} lttd 纬度
+     * @param {*} color 颜色
+     */
+    createTwinkleEntitys: function (entitys, lgtd, lttd, image, color) {
+      var symbol = new esri.symbol.PictureMarkerSymbol(image, 64, 64);
+      var width = 64;
+      var height = 64;
+      var pt = new Point(lgtd, lttd, new SpatialReference({
+        wkid: 4326
+      }));
+
+      var graphic = new esri.Graphic(pt, symbol);
+
+      setInterval(function () {
+        if (width >= 80) {
+          width = 64;
+          height = 64;
+        }
+        width += 1;
+        height += 1;
+        symbol.width = width;
+        symbol.height = height;
+        graphic.setSymbol(symbol)
+        entitys.add(graphic);
+      }, 50)
+    },
 
     addPoints: function (entitys, lgtd, lttd, img) {
       var symbol = new esri.symbol.PictureMarkerSymbol(img, 20, 20);

--
Gitblit v1.9.3