From cea08163227020e5582c195034285b0f488e026f Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 27 May 2024 14:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E8=A7=86=E9=A2=91=E8=B5=B0ng?=
 =?UTF-8?q?inx=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/map/index.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index b86d09a..8bf3693 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-05-27 10:16:44
+ * @LastEditTime: 2024-05-27 14:32:11
 -->
 <template>
   <div class="map-main">
@@ -1146,10 +1146,16 @@ export default {
               let location = element.location?.split(',');
 
               // obj.imgSrc = element.status == "0" ? offIcon4 : ico5;
+              
               if(location) {
-                obj.position[0] = location[0];
-                obj.position[1] = location[1];
-                obj.lnglat = new AMap.LngLat(location.length > 0 ? location[0] : 0 ,location.length > 0 ? location[1] : 0)
+                lonLat = this.wgs84togcj02(element.longitude,element.latitude);
+                // obj.position[0] = location[0];
+                // obj.position[1] = location[1];
+                obj.position[0] = lonLat ? lonLat[0] : 0;
+                obj.position[1] = lonLat ? lonLat[1] : 0;
+                
+                // obj.lnglat = new AMap.LngLat(location.length > 0 ? location[0] : 0 ,location.length > 0 ? location[1] : 0)
+                obj.lnglat = new AMap.LngLat(lonLat ? lonLat[0] : 0 ,lonLat ? lonLat[1] : 0)
               } else {
                 obj.position[0] = 0;
                 obj.position[1] = 0;
@@ -1234,7 +1240,7 @@ export default {
             let obj = {position:[]};
             let lonLat;
             if(element.longitude && element.latitude) {
-                lonLat = this.wgs84togcj02(element.longitude,element.latitude);
+              lonLat = this.wgs84togcj02(element.longitude,element.latitude);
             }
             // obj.position[0] = element.longitude;
             obj.position[0] = lonLat ? lonLat[0] : 0;
@@ -1476,7 +1482,10 @@ export default {
         getPreviewURLs({protocol:'hls',cameraIndexCode:this.monitoringInfo.info.cameraIndexCode,expand:"transcode=1"}).then(res=>{
           if(res.code == 200) {
             // console.log(res,'视频地址获取');
-            this.$refs.aloneVideo.open(res.msg);
+            // this.$refs.aloneVideo.open(res.msg);
+            let videoUrl = res.msg;
+            var code1 = videoUrl.match(/\/openUrl\/(.*)/)[1]
+            this.$refs.aloneVideo.open(`https://bjh.jndz.cn/bjh-admin-server/jn/videosLive/${code1}`);
           }
         })
       } else {