From 2def3738c2befb07925f83f24674b70f04bebcb5 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Tue, 20 Feb 2024 13:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/amap-item.less                | 106 +++++++++---------
 src/assets/mapUtils/map.ts                    |  19 +++-
 .../secondaryScreen/secondMap/secondMap.vue   |   2 +-
 src/views/indexSon.vue                        |   2 +-
 4 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/src/assets/less/amap-item.less b/src/assets/less/amap-item.less
index 0248f3c..949fbb8 100644
--- a/src/assets/less/amap-item.less
+++ b/src/assets/less/amap-item.less
@@ -1,79 +1,79 @@
 //高德信息弹窗
 .amap-info-contentContainer {
-  .amap-content-body {
-    background: #00152B;
-    border: 1px solid #129BFF;
+    .amap-content-body {
+        background: #00152B;
+        border: 1px solid #129BFF;
 
-    .amap-lib-infowindow {
-      background: #00152B;
+        .amap-lib-infowindow {
+            background: #00152B;
 
-      .amap-lib-infowindow-title {
-        color: #fff;
-        border-bottom: 1px solid #129BFF;
-        padding: 4px 0;
-      }
+            .amap-lib-infowindow-title {
+                color: #fff;
+                border-bottom: 1px solid #129BFF;
+                padding: 4px 0;
+            }
 
-      .amap-lib-infowindow-content {
-        color: #fff;
-        padding: 4px 0;
-      }
+            .amap-lib-infowindow-content {
+                color: #fff;
+                padding: 4px 0;
+            }
+        }
     }
-  }
 
-  .amap-combo-close {
-    top: 5px;
-    right: 7px;
-  }
+    .amap-combo-close {
+        top: 5px;
+        right: 7px;
+    }
 }
 
 
 /*地图元素样式---start*/
 //marker
 .amap-marker-label {
-  padding: 0;
-  border: none;
+    padding: 0;
+    border: none;
 }
 
 .alarm-content {
-  background-color: #263d5e;
-  color: #fff;
-  font-size: 14px;
-  padding: 7px 10px;
-  border: 1px solid #1b7ef2;
-  position: relative;
-
-  .close-btn {
-    position: absolute;
-    top: -6px;
-    right: -8px;
-    width: 15px;
-    height: 15px;
-    font-size: 12px;
-    background: #ccc;
-    border-radius: 50%;
+    background-color: #263d5e;
     color: #fff;
-    text-align: center;
-    line-height: 15px;
-    box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
-  }
+    font-size: 14px;
+    padding: 7px 10px;
+    border: 1px solid #1b7ef2;
+    position: relative;
 
-  .close-btn:hover {
-    background: #666;
-  }
+    .close-btn {
+        position: absolute;
+        top: -6px;
+        right: -8px;
+        width: 15px;
+        height: 15px;
+        font-size: 12px;
+        background: #ccc;
+        border-radius: 50%;
+        color: #fff;
+        text-align: center;
+        line-height: 15px;
+        box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
+    }
+
+    .close-btn:hover {
+        background: #666;
+    }
 }
 
 /*地图元素样式---end*/
 /*infoWindow*/
 .amap-info-content {
-  width: 100%;
-  height: 100%;
-  background: url("../images/info-modal.png") no-repeat center;
-  background-size: 100% 100%;
-  //padding: 16px 18px 22px 10px;
+    width: 100%;
+    height: 100%;
+    background: url("../images/info-modal.png") no-repeat center;
+    background-size: 100% 100%;
+    //padding: 16px 18px 22px 10px;
 }
 
 .amap-info-contentContainer {
-  .amap-info-sharp {
-    border-top: none;
-  }
-}
\ No newline at end of file
+    .amap-info-sharp {
+        border-top: none;
+    }
+}
diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts
index c07fa8d..8e8a270 100644
--- a/src/assets/mapUtils/map.ts
+++ b/src/assets/mapUtils/map.ts
@@ -56,12 +56,12 @@ export const Map = {
             getPolygon: function (geoJson: string, lngLats: any) {
                 return new AMap.Polyline({
                     path: lngLats[0],
-                    strokeColor: '#6ccffe',
+                    strokeColor: '#2384dd',
                     strokeWeight: 3,
-                    lineJoin: 'round', //折线拐点的绘制样式
-                    isOutline: true,
+                    // lineJoin: 'round', //折线拐点的绘制样式
+                    isOutline: false,
                     borderWeight: 2,
-                    outlineColor: '#2d475f',
+                    // outlineColor: '#6ccffe',
                 });
             },
         });
@@ -75,8 +75,17 @@ export const Map = {
             getPolygon: function (geoJson: string, lngLats: any) {
                 return new AMap.Polyline({
                     path: lngLats[0],
-                    strokeColor: '#359de5',
+                    // strokeColor: '#57b2f8',
+                    // strokeColor: '#2BA5FF',
+                    // strokeColor: '#3d6eff',
+                    // strokeWeight: 2,
+                    // zIndex: 10,
+                    isOutline: true,
+                    outlineColor: '#2692fc', //88a5f8
+                    borderWeight: 1,
+                    strokeColor: '#88b9f8', //2657fc
                     strokeWeight: 1,
+                    strokeOpacity: 0.8,
                 });
             },
         });
diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue
index c6f1155..fecbdd8 100644
--- a/src/components/secondaryScreen/secondMap/secondMap.vue
+++ b/src/components/secondaryScreen/secondMap/secondMap.vue
@@ -269,4 +269,4 @@
             }
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue
index 5cad413..685cf2f 100644
--- a/src/views/indexSon.vue
+++ b/src/views/indexSon.vue
@@ -204,4 +204,4 @@
         background: url('../assets/images/bottom-b.png') no-repeat;
         background-size: 100% 100%;
     }
-</style>
\ No newline at end of file
+</style>