From f9ce658f49480944ba0c23ff8af1a299627da4b0 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 3 Dec 2024 15:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E4=B8=AD=E5=8E=82=E5=9B=AD=E4=B8=AD?=
 =?UTF-8?q?=E5=9B=AD=E8=A7=86=E9=A2=91=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E3=80=81=E6=A8=A1=E6=8B=9F=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/amap.scss       |  6 +++---
 src/views/bigScreen/map/index.vue | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/assets/styles/amap.scss b/src/assets/styles/amap.scss
index 0929d07..f877109 100644
--- a/src/assets/styles/amap.scss
+++ b/src/assets/styles/amap.scss
@@ -20,9 +20,9 @@
     background-image: url('../images/personInfo.png');
     background-size: 100% 100%;
     margin-bottom: 5px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    // overflow: hidden;
+    // white-space: nowrap;
+    // text-overflow: ellipsis;
   }
   .tag {
     display: flex;
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index b88efe3..babc39e 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-10-15 11:16:00
+ * @LastEditTime: 2024-11-28 14:58:43
 -->
 <template>
   <div class="map-main">
@@ -920,14 +920,15 @@ export default {
     _renderMarkerTwo (context) {
       // ${context.data[0].info.deviceName.length * 17}
       var content = `<div class="markerStyles"><div class="marker-Text" style="width:85px">${context.data[0].info.deviceName}</div><img src="${require("../../../assets/images/icon/icon5.png")}" alt=""></div>`;
-      var offset = new AMap.Pixel(-32.5, -48.5);
+      let strLength = context.data[0].info.deviceName.length / 5;
+      var offset = new AMap.Pixel(-28.5, -(Math.floor(strLength) * 36));
       context.marker.setContent(content)
       context.marker.setOffset(offset)
       context.marker.on('click',(ev)=>{
         // this.monitoringInfo.position = context.data[0].position;
         // this.monitoringInfo.info = context.data[0].info;
         // this.monitoringInfo.visible = true;
-        getDeviceMediaUrlHls({deviceCode:this.monitoringInfo.info.deviceCode}).then(res=>{
+        getDeviceMediaUrlHls({deviceCode:context.data[0].info.deviceCode}).then(res=>{
           if(res.url) {
             this.$refs.aloneVideo.open(res.url);
           }
@@ -2603,6 +2604,9 @@ export default {
         this.markerOffset = new AMap.Pixel(-27, -94);
       } else if (id == 6) {
         this.MyInput = false;
+        this.switches[0].active = true;
+        this.switches[1].active = false;
+        this.switches[2].active = false;
         this.markerOffset = new AMap.Pixel(-27, -94);
       }
       this.getMarkers(id);
@@ -2887,7 +2891,7 @@ export default {
   mounted() {
     // this.getPersonIcon();
     this.getCarList();
-    // this.getrobotToken();
+    this.getrobotToken();
     window.addEventListener('beforeunload', e => this.beforeunloadHandler(e));
     window.addEventListener('unload', e => this.unloadHandler(e));
     // this.markerInterval();