From 1d1fb3db307f736c0f612db3a526db6fcf5aab43 Mon Sep 17 00:00:00 2001
From: luojie <php_echo@163.com>
Date: Thu, 19 Oct 2023 20:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E9=97=AA=E7=83=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/map/icon_paishuibeng_h.png     | Bin 0 -> 3955 bytes
 hd-glasses-app/src/pages/hd_map.vue           |  88 +++++++++++++++---
 2 files changed, 74 insertions(+), 14 deletions(-)
 create mode 100644 hd-glasses-app/src/assets/map/icon_paishuibeng_h.png

diff --git a/hd-glasses-app/src/assets/map/icon_paishuibeng_h.png b/hd-glasses-app/src/assets/map/icon_paishuibeng_h.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b17437e5235d08c8491c3737267d7695d02a06
GIT binary patch
literal 3955
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
N002ovPDHLkV1m9!gbM%w

literal 0
HcmV?d00001

diff --git a/hd-glasses-app/src/pages/hd_map.vue b/hd-glasses-app/src/pages/hd_map.vue
index abb09aa..782dae7 100644
--- a/hd-glasses-app/src/pages/hd_map.vue
+++ b/hd-glasses-app/src/pages/hd_map.vue
@@ -311,15 +311,6 @@ export default {
       }
       this.selectPoint = coordinate;
       this.coordinate = coordinate;
-      console.log(JSON.stringify(this.coordinate))
-      if (Object.keys(this.pointLayer).length == 0) {
-        // 创建图层
-        this.pointLayer = new VectorLayer({
-          source: new VectorSource(),
-        });
-        // 图层添加到地图上
-        this.map.addLayer(this.pointLayer);
-      }
 
       // 创建feature要素，一个feature就是一个点坐标信息
       const feature = new Feature({
@@ -483,8 +474,8 @@ export default {
         if (res.status == 200) {
           res.data.result.records.map(record => {
             try {
-              if (record.leastLocation.length > 0) {
-                this.map.removeInteraction(record.leastLocation, "equipment")
+              if (record.leastLocation!=null) {
+                this.addPointWidthCoordinate(record.leastLocation, "equipment")
               }
             } catch (e) {
               console.error(e)
@@ -504,8 +495,8 @@ export default {
         if (res.status == 200) {
           res.data.result.records.map(record => {
             try {
-              if (record.location.length > 0) {
-                this.map.removeInteraction(record.location, "alarm")
+              if (record.location!=null) {
+                this.addPointWidthCoordinate(record.location, "alarm")
               }
             } catch (e) {
               console.error(e)
@@ -519,7 +510,76 @@ export default {
       location.href = "uniwebview://action?function=switchBigScreen"
     },
     addPointWidthCoordinate(coordinate, type) {
-      console.log("addPointWidthCoordinate", type, coordinate)
+      coordinate=coordinate.split(",")
+      if(type=='alarm'){
+        console.log("addPointWidthCoordinate", type, coordinate)
+        if (Object.keys(this.alarmLayer).length == 0) {
+          // 创建图层
+          this.alarmLayer = new VectorLayer({
+            source: new VectorSource(),
+          });
+          // 图层添加到地图上
+          this.map.addLayer(this.alarmLayer);
+          var flag=true
+          var animation=setInterval(() => {
+            flag=!flag
+            this.alarmLayer.setVisible(flag)
+          }, 300);
+        }
+
+        const feature = new Feature({
+          geometry: new Point(coordinate),
+        });
+        // 设置要素的图标
+        feature.setStyle(
+            new Style({
+              // 设置图片效果
+              image: new Icon({
+                src: getStatisFileUrl("/map/icon_paishuibeng_h.png"),
+                // anchor: [0.5, 0.5],
+                scale: 0.4,
+              }),
+            })
+        );
+        // 要素添加到地图图层上
+        this.alarmLayer.getSource().addFeature(feature);
+
+      }
+      if(type=='equipment'){
+        console.log("addPointWidthCoordinate", type, coordinate)
+        if (Object.keys(this.equipmentLayer).length == 0) {
+          // 创建图层
+          this.equipmentLayer = new VectorLayer({
+            source: new VectorSource(),
+          });
+          // 图层添加到地图上
+          this.map.addLayer(this.equipmentLayer);
+        }
+
+        const feature = new Feature({
+          geometry: new Point(coordinate),
+        });
+        // 设置要素的图标
+        feature.setStyle(
+            new Style({
+              // 设置图片效果
+              image: new Icon({
+                src: getStatisFileUrl("/map/icon_paishuibeng_h_2.png"),
+                // anchor: [0.5, 0.5],
+                scale: 0.4,
+              }),
+            })
+        );
+        // 要素添加到地图图层上
+
+        this.equipmentLayer.getSource().addFeature(feature);
+      }
+
+
+
+
+
+
     }
   },
 };