From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改

---
 src/views/security/security.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index b641cb7..f5e744e 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -70,7 +70,7 @@
         selectionList: [],
         option: {
           height: 'auto',
-          calcHeight: 30,
+          calcHeight: 54,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -118,11 +118,11 @@
               prop: "online_status",
               dicData: [{
                 label: "离线",
-                value: 0
+                value: "0"
               },
                 {
                   label: "在线",
-                  value: 1
+                  value: "1"
                 },
               ],
             },
@@ -251,21 +251,25 @@
       //打开地图
       handleMap(row) {
         var that =this;
-        
-        that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
+        if(row.jd=="" || row.jd=="0.0"){
+          var rwjd = "115.862321";
+          var rwwd = "28.591108";
+          that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${rwjd}&wd=${rwwd}&code=${row.code}&name=${row.realName}`;
+        }else{
+          that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
+        }
         this.showMap=true;
         this.$refs.securityMap.onload = () => {
           if (window.frames[0].init) {
-            if(row.jd==""){
+            if(row.jd=="" || row.jd=="0.0"){
               //如果处警员无位置信息,则赋值一个默认数据,否则地图无法加载
               window.frames[0].init("SecurityMap", {
-                              x: "115.862321",
-                              y: "28.591108",
+                              x: rwjd,
+                              y: rwwd,
                               code:row.code
                           });
             }else{
               window.frames[0].init("SecurityMap", {
-                            
                               x: row.jd,
                               y: row.wd,
                               code:row.code

--
Gitblit v1.9.3